From 97f956f7ef1d597f1608e3db56bfe6098d5df394 Mon Sep 17 00:00:00 2001 From: squalus Date: Tue, 23 Jul 2024 23:20:05 -0700 Subject: [PATCH 001/146] scarlett2: init at 0-unstable-2024-04-06 --- pkgs/by-name/sc/scarlett2/package.nix | 63 +++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 pkgs/by-name/sc/scarlett2/package.nix diff --git a/pkgs/by-name/sc/scarlett2/package.nix b/pkgs/by-name/sc/scarlett2/package.nix new file mode 100644 index 0000000000000..82d7be656f520 --- /dev/null +++ b/pkgs/by-name/sc/scarlett2/package.nix @@ -0,0 +1,63 @@ +{ + stdenv, + fetchFromGitHub, + alsa-lib, + openssl, + pkg-config, + lib, + unstableGitUpdater, +}: + +let + + firmwareSrc = fetchFromGitHub { + owner = "geoffreybennett"; + repo = "scarlett2-firmware"; + rev = "f628dfb4d2e874b2078dbb43e8c1d59dd6553dd1"; + hash = "sha256-s61eyS47SuIbK9KR59XxHpybvl9tHFWPLkpHmdqwO24="; + }; + +in +stdenv.mkDerivation { + + pname = "scarlett2"; + + version = "0-unstable-2024-04-06"; + + src = fetchFromGitHub { + owner = "geoffreybennett"; + repo = "scarlett2"; + rev = "1c262bcac11bceb6da8334b8f5b56d3c9331bfc8"; + hash = "sha256-yhmXVfys300NwZ8UJ7WvOyNkGP3OkIVoRaToF+SenQA="; + }; + + buildInputs = [ + alsa-lib + openssl + ]; + + nativeBuildInputs = [ pkg-config ]; + + preBuild = '' + makeFlagsArray+=( PREFIX=$out ) + ''; + + passthru.updateScript = unstableGitUpdater { }; + + # the program expects to find firmware files in a directory called "firmware" relative to the resolved path of the binary + postInstall = '' + mkdir -p $out/share + mv $out/bin/scarlett2 $out/share + ln -s $out/share/scarlett2 $out/bin/scarlett2 + ln -s ${firmwareSrc}/firmware $out/share/firmware + ''; + + meta = { + description = "Scarlett2 Firmware Management Utility for Scarlett 2nd, 3rd, and 4th Gen, Clarett USB, and Clarett+ interfaces"; + homepage = "https://github.com/geoffreybennett/scarlett2"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ squalus ]; + mainProgram = "scarlett2"; + }; + +} From fce6f3ff6a080901bd0398b932d8ce3ed95d4968 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Aug 2024 09:04:42 +0000 Subject: [PATCH 002/146] cudaPackages.nccl-tests: 2.13.9 -> 2.13.10 --- pkgs/development/cuda-modules/nccl-tests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/cuda-modules/nccl-tests/default.nix b/pkgs/development/cuda-modules/nccl-tests/default.nix index 10dd488abbaf1..f230dc8fdb418 100644 --- a/pkgs/development/cuda-modules/nccl-tests/default.nix +++ b/pkgs/development/cuda-modules/nccl-tests/default.nix @@ -25,13 +25,13 @@ in backendStdenv.mkDerivation (finalAttrs: { pname = "nccl-tests"; - version = "2.13.9"; + version = "2.13.10"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nccl-tests"; rev = "v${finalAttrs.version}"; - hash = "sha256-QYuMBPhvHHVo2ku14jD1CVINLPW0cyiXJkXxb77IxbE="; + hash = "sha256-H9shp4fYW+dlyL9FZRxX761UCFR/pOBKNHfVme2TfJg="; }; strictDeps = true; From d5b20477d3018ba8651af021d4862e2af2119ff6 Mon Sep 17 00:00:00 2001 From: Daniel Poelzleithner Date: Thu, 21 Dec 2023 00:24:23 +0100 Subject: [PATCH 003/146] cpp-redis: init at 4.3.1 --- .../cp/cpp-redis/01-fix-sleep_for.patch | 12 ++++++ pkgs/by-name/cp/cpp-redis/package.nix | 38 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/by-name/cp/cpp-redis/01-fix-sleep_for.patch create mode 100644 pkgs/by-name/cp/cpp-redis/package.nix diff --git a/pkgs/by-name/cp/cpp-redis/01-fix-sleep_for.patch b/pkgs/by-name/cp/cpp-redis/01-fix-sleep_for.patch new file mode 100644 index 0000000000000..54bc953f3a962 --- /dev/null +++ b/pkgs/by-name/cp/cpp-redis/01-fix-sleep_for.patch @@ -0,0 +1,12 @@ +diff --git a/sources/core/client.cpp b/sources/core/client.cpp +index 7ea20e2..c5d2c40 100644 +--- a/sources/core/client.cpp ++++ b/sources/core/client.cpp +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + namespace cpp_redis { + diff --git a/pkgs/by-name/cp/cpp-redis/package.nix b/pkgs/by-name/cp/cpp-redis/package.nix new file mode 100644 index 0000000000000..6fc1e5b7c1e33 --- /dev/null +++ b/pkgs/by-name/cp/cpp-redis/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, +}: + +stdenv.mkDerivation rec { + pname = "cpp-redis"; + version = "4.3.1"; + + src = fetchFromGitHub { + owner = "cpp-redis"; + repo = "cpp_redis"; + rev = version; + hash = "sha256-dLAnxgldylWWKO3WIyx+F7ylOpRH+0nD7NZjWSOxuwQ="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + CFLAGS = "-D_GLIBCXX_USE_NANOSLEEP"; + patches = [ + ./01-fix-sleep_for.patch + ]; + + meta = with lib; { + description = "C++11 Lightweight Redis client: async, thread-safe, no dependency, pipelining, multi-platform"; + homepage = "https://github.com/cpp-redis/cpp_redis"; + changelog = "https://github.com/cpp-redis/cpp_redis/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ poelzi ]; + platforms = platforms.all; + }; +} From 47177c0ec92a6e6b73d1247f384ba6cc94a6ccfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20M=C3=A9meint?= Date: Tue, 2 Apr 2024 17:43:40 +0200 Subject: [PATCH 004/146] nixos/luksroot: Exit if EOF detected --- nixos/modules/system/boot/luksroot.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 65190e65d9b98..59876dabc5f97 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -502,7 +502,11 @@ let echo -n "Passphrase for $device: " IFS= read -rs passphrase + ret=$? echo + if [ $ret -ne 0 ]; then + die "End of file reached. Exiting shell." + fi rm /crypt-ramfs/device echo -n "$passphrase" > /crypt-ramfs/passphrase From 421c9a21aed2cf56c58f5c3bfdacf9690550118b Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Sun, 15 Sep 2024 04:46:46 +0700 Subject: [PATCH 005/146] nixos/frigate: add rtmp nginx module --- nixos/modules/services/video/frigate.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix index 5c259b7fa14d0..2b816af49df86 100644 --- a/nixos/modules/services/video/frigate.nix +++ b/nixos/modules/services/video/frigate.nix @@ -167,6 +167,7 @@ in enable = true; additionalModules = with pkgs.nginxModules; [ develkit + rtmp secure-token set-misc vod From bda399c7e8427a9f3ebae43804f4b2e3107fa45c Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sat, 14 Sep 2024 20:58:10 +0200 Subject: [PATCH 006/146] prettierd: remove mkYarnPackage usage --- pkgs/by-name/pr/prettierd/package.json | 45 -------------------------- pkgs/by-name/pr/prettierd/package.nix | 42 +++++++++++------------- 2 files changed, 18 insertions(+), 69 deletions(-) delete mode 100644 pkgs/by-name/pr/prettierd/package.json diff --git a/pkgs/by-name/pr/prettierd/package.json b/pkgs/by-name/pr/prettierd/package.json deleted file mode 100644 index 085e4ab73f7c3..0000000000000 --- a/pkgs/by-name/pr/prettierd/package.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "name": "@fsouza/prettierd", - "version": "0.25.3", - "description": "prettier, as a daemon", - "bin": { - "prettierd": "./bin/prettierd" - }, - "scripts": { - "prepare": "yarn build", - "build": "tsc -b", - "run": "node bin/prettierd", - "start": "node bin/prettierd start", - "prettier:check": "prettier --check .", - "prettier:fix": "prettier --write ." - }, - "repository": { - "type": "git", - "url": "git+https://github.com/fsouza/prettierd.git" - }, - "author": "Francisco Souza", - "license": "ISC", - "bugs": { - "url": "https://github.com/fsouza/prettierd/issues" - }, - "homepage": "https://github.com/fsouza/prettierd", - "devDependencies": { - "@types/node": "^20.12.7", - "@types/prettier": "^3.0.0", - "typescript": "^5.4.5" - }, - "dependencies": { - "core_d": "^6.1.0", - "prettier": "^3.2.5" - }, - "files": [ - "bin", - "dist", - "LICENSE", - "README.md" - ], - "optionalDependencies": { - "@babel/parser": "^7.24.4", - "@typescript-eslint/typescript-estree": "^7.6.0" - } -} diff --git a/pkgs/by-name/pr/prettierd/package.nix b/pkgs/by-name/pr/prettierd/package.nix index 1025a90fbd377..9fcfe5c2b2984 100644 --- a/pkgs/by-name/pr/prettierd/package.nix +++ b/pkgs/by-name/pr/prettierd/package.nix @@ -1,55 +1,49 @@ { lib, - mkYarnPackage, + stdenv, fetchFromGitHub, - makeWrapper, - nodejs, fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, }: -mkYarnPackage rec { + +stdenv.mkDerivation (finalAttrs: { pname = "prettierd"; version = "0.25.3"; src = fetchFromGitHub { owner = "fsouza"; repo = "prettierd"; - rev = "v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-3lvFZ5/p+1kPnHIR2PlQtCY3SVo1rs8IuBigLaabxAE="; }; offlineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; + yarnLock = finalAttrs.src + "/yarn.lock"; hash = "sha256-Ti2b102pzUKB6Xy3LwZ7DlrnW0cRscgNLTUIAKz+6Us="; }; - packageJSON = ./package.json; - - nativeBuildInputs = [ makeWrapper ]; - - buildPhase = '' - runHook preBuild - export HOME=$(mktemp -d) - yarn --offline build - runHook postBuild - ''; - - # prettierd needs to be wrapped with nodejs so that it can be executed - postInstall = '' - wrapProgram "$out/bin/prettierd" --prefix PATH : "${nodejs}/bin" - ''; + strictDeps = true; - doDist = false; + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + ]; meta = { mainProgram = "prettierd"; description = "Prettier, as a daemon, for improved formatting speed"; homepage = "https://github.com/fsouza/prettierd"; license = lib.licenses.isc; - changelog = "https://github.com/fsouza/prettierd/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/fsouza/prettierd/blob/${finalAttrs.src.rev}/CHANGELOG.md"; platforms = with lib.platforms; linux ++ darwin; maintainers = with lib.maintainers; [ NotAShelf n3oney ]; }; -} +}) From d957526c0651240658dbf004a5a3e29d68de2459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 11 Oct 2024 13:10:19 +0200 Subject: [PATCH 007/146] nixos/dbus: inline once used homeDir --- nixos/modules/services/system/dbus.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index d84136125f934..799196eefcc94 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -6,8 +6,6 @@ let cfg = config.services.dbus; - homeDir = "/run/dbus"; - configDir = pkgs.makeDBusConf { inherit (cfg) apparmor; suidHelper = "${config.security.wrapperDir}/dbus-daemon-launch-helper"; @@ -94,7 +92,7 @@ in users.users.messagebus = { uid = config.ids.uids.messagebus; description = "D-Bus system message bus daemon user"; - home = homeDir; + home = "/run/dbus"; homeMode = "0755"; group = "messagebus"; }; From 172f25b6ad962378d137eeaf4eecddc4aa63b647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 11 Oct 2024 13:37:49 +0200 Subject: [PATCH 008/146] makeDBusConf: make overrideable --- nixos/modules/services/system/dbus.nix | 4 ++-- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 799196eefcc94..c8548f6b7db3c 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -6,7 +6,7 @@ let cfg = config.services.dbus; - configDir = pkgs.makeDBusConf { + configDir = pkgs.makeDBusConf.override { inherit (cfg) apparmor; suidHelper = "${config.security.wrapperDir}/dbus-daemon-launch-helper"; serviceDirectories = cfg.packages; @@ -123,7 +123,7 @@ in boot.initrd.systemd = { users.messagebus = { }; groups.messagebus = { }; - contents."/etc/dbus-1".source = pkgs.makeDBusConf { + contents."/etc/dbus-1".source = pkgs.makeDBusConf.override { inherit (cfg) apparmor; suidHelper = "/bin/false"; serviceDirectories = [ pkgs.dbus config.boot.initrd.systemd.package ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e225df92669cf..4a03bcb387c15 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19317,10 +19317,7 @@ with pkgs; dbus-sharp-glib-1_0 = callPackage ../development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix { }; dbus-sharp-glib-2_0 = callPackage ../development/libraries/dbus-sharp-glib { }; - makeDBusConf = { suidHelper, serviceDirectories, apparmor ? "disabled" }: - callPackage ../development/libraries/dbus/make-dbus-conf.nix { - inherit suidHelper serviceDirectories apparmor; - }; + makeDBusConf = callPackage ../development/libraries/dbus/make-dbus-conf.nix { }; dee = callPackage ../development/libraries/dee { autoreconfHook = buildPackages.autoreconfHook269; From cfc0d6bee8e110f76f3d1ac8d99e3a669386f961 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 11 Oct 2024 13:15:18 +0200 Subject: [PATCH 009/146] nixos/dbus: add package options --- nixos/modules/services/system/dbus.nix | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index c8548f6b7db3c..b07bbc12574d1 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -8,6 +8,7 @@ let configDir = pkgs.makeDBusConf.override { inherit (cfg) apparmor; + dbus = cfg.dbusPackage; suidHelper = "${config.security.wrapperDir}/dbus-daemon-launch-helper"; serviceDirectories = cfg.packages; }; @@ -35,6 +36,10 @@ in ''; }; + dbusPackage = lib.mkPackageOption pkgs "dbus" {}; + + brokerPackage = lib.mkPackageOption pkgs "dbus-broker" {}; + implementation = mkOption { type = types.enum [ "dbus" "broker" ]; default = "dbus"; @@ -44,7 +49,6 @@ in performance and reliability, while keeping compatibility to the D-Bus reference implementation. ''; - }; packages = mkOption { @@ -101,16 +105,16 @@ in # Install dbus for dbus tools even when using dbus-broker environment.systemPackages = [ - pkgs.dbus + cfg.dbusPackage ]; # You still need the dbus reference implementation installed to use dbus-broker systemd.packages = [ - pkgs.dbus + cfg.dbusPackage ]; services.dbus.packages = [ - pkgs.dbus + cfg.dbusPackage config.system.path ]; @@ -125,12 +129,13 @@ in groups.messagebus = { }; contents."/etc/dbus-1".source = pkgs.makeDBusConf.override { inherit (cfg) apparmor; + dbus = cfg.dbusPackage; suidHelper = "/bin/false"; - serviceDirectories = [ pkgs.dbus config.boot.initrd.systemd.package ]; + serviceDirectories = [ cfg.dbusPackage config.boot.initrd.systemd.package ]; }; - packages = [ pkgs.dbus ]; + packages = [ cfg.dbusPackage ]; storePaths = [ - "${pkgs.dbus}/bin/dbus-daemon" + "${cfg.dbusPackage}/bin/dbus-daemon" "${config.boot.initrd.systemd.package}/share/dbus-1/system-services" "${config.boot.initrd.systemd.package}/share/dbus-1/system.d" ]; @@ -140,7 +145,7 @@ in (mkIf (cfg.implementation == "dbus") { security.wrappers.dbus-daemon-launch-helper = { - source = "${pkgs.dbus}/libexec/dbus-daemon-launch-helper"; + source = "${cfg.dbusPackage}/libexec/dbus-daemon-launch-helper"; owner = "root"; group = "messagebus"; setuid = true; @@ -179,11 +184,11 @@ in (mkIf (cfg.implementation == "broker") { environment.systemPackages = [ - pkgs.dbus-broker + cfg.brokerPackage ]; systemd.packages = [ - pkgs.dbus-broker + cfg.brokerPackage ]; # Just to be sure we don't restart through the unit alias From 194aa78bd74ef2c37ac004a469a414a0cb299046 Mon Sep 17 00:00:00 2001 From: lilly Date: Tue, 29 Oct 2024 21:12:24 +0100 Subject: [PATCH 010/146] maintainers: add lilioid --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bfacf3aae0c3e..f441dee3b9fb2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12338,6 +12338,13 @@ githubId = 101508537; name = "Yuchen He"; }; + lilioid = { + name = "Lilly"; + email = "li@lly.sh"; + matrix = "@17sell:mafiasi.de"; + github = "lilioid"; + githubId = 12398140; + }; LilleAila = { name = "Olai"; email = "olai@olai.dev"; From a00c1932aba9b6400e1595cd7e0ded3e76d509b1 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Thu, 31 Oct 2024 21:19:02 +0100 Subject: [PATCH 011/146] nixos/akkoma: Provide cache directory via environment CACHE_DIRECTORY is used in the default configuration and therefore needs to be provided in the environment for pleroma_ctl. --- nixos/modules/services/web-apps/akkoma.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix index 17c221778d89a..a69d6bd7225bb 100644 --- a/nixos/modules/services/web-apps/akkoma.nix +++ b/nixos/modules/services/web-apps/akkoma.nix @@ -279,6 +279,7 @@ let cd "${cfg.package}" RUNTIME_DIRECTORY="''${RUNTIME_DIRECTORY:-/run/akkoma}" + CACHE_DIRECTORY="''${CACHE_DIRECTORY:-/var/cache/akkoma}" \ AKKOMA_CONFIG_PATH="''${RUNTIME_DIRECTORY%%:*}/config.exs" \ ERL_EPMD_ADDRESS="${cfg.dist.address}" \ ERL_EPMD_PORT="${toString cfg.dist.epmdPort}" \ From 89fbc2b61b44016dec6cfb328fe6700958de678a Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Sat, 2 Nov 2024 17:16:49 +0100 Subject: [PATCH 012/146] nixos/akkoma: Include ImageMagick by default ImageMagick is used to generate image previews in the media proxy. While compatible, GraphicsMagick fails to read a lot of images in practice. --- nixos/modules/services/web-apps/akkoma.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix index 17c221778d89a..de26a0022f30e 100644 --- a/nixos/modules/services/web-apps/akkoma.nix +++ b/nixos/modules/services/web-apps/akkoma.nix @@ -452,8 +452,8 @@ in { extraPackages = mkOption { type = with types; listOf package; - default = with pkgs; [ exiftool ffmpeg-headless graphicsmagick-imagemagick-compat ]; - defaultText = literalExpression "with pkgs; [ exiftool ffmpeg-headless graphicsmagick-imagemagick-compat ]"; + default = with pkgs; [ exiftool ffmpeg-headless imagemagick ]; + defaultText = literalExpression "with pkgs; [ exiftool ffmpeg-headless imagemagick ]"; example = literalExpression "with pkgs; [ exiftool ffmpeg-full imagemagick ]"; description = '' List of extra packages to include in the executable search path of the service unit. From 5cd68d33bbcd73c7e2d852117a470addd2e8cf14 Mon Sep 17 00:00:00 2001 From: Isidor Zeuner Date: Mon, 21 Oct 2024 09:40:16 +0200 Subject: [PATCH 013/146] python3Packages.torch: enable vulkan support --- .../python-modules/torch/default.nix | 173 ++++++++++-------- pkgs/top-level/python-packages.nix | 4 + 2 files changed, 100 insertions(+), 77 deletions(-) diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index cd43c04d67d40..c14bcf3d37ea7 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -91,6 +91,11 @@ rocmSupport ? config.rocmSupport, rocmPackages_5, gpuTargets ? [ ], + + vulkanSupport ? false, + vulkan-headers, + vulkan-loader, + shaderc, }: let @@ -412,58 +417,66 @@ buildPythonPackage rec { # https://github.com/pytorch/pytorch/commit/3d617333e PYTHON_LIB_REL_PATH = "${placeholder "out"}/${python.sitePackages}"; - # Suppress a weird warning in mkl-dnn, part of ideep in pytorch - # (upstream seems to have fixed this in the wrong place?) - # https://github.com/intel/mkl-dnn/commit/8134d346cdb7fe1695a2aa55771071d455fae0bc - # https://github.com/pytorch/pytorch/issues/22346 - # - # Also of interest: pytorch ignores CXXFLAGS uses CFLAGS for both C and C++: - # https://github.com/pytorch/pytorch/blob/v1.11.0/setup.py#L17 - env.NIX_CFLAGS_COMPILE = toString ( - ( - lib.optionals (blas.implementation == "mkl") [ "-Wno-error=array-bounds" ] - # Suppress gcc regression: avx512 math function raises uninitialized variable warning - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105593 - # See also: Fails to compile with GCC 12.1.0 https://github.com/pytorch/pytorch/issues/77939 - ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12.0.0") [ - "-Wno-error=maybe-uninitialized" - "-Wno-error=uninitialized" - ] - # Since pytorch 2.0: - # gcc-12.2.0/include/c++/12.2.0/bits/new_allocator.h:158:33: error: ‘void operator delete(void*, std::size_t)’ - # ... called on pointer ‘’ with nonzero offset [1, 9223372036854775800] [-Werror=free-nonheap-object] - ++ lib.optionals (stdenv.cc.isGNU && lib.versions.major stdenv.cc.version == "12") [ - "-Wno-error=free-nonheap-object" - ] - # .../source/torch/csrc/autograd/generated/python_functions_0.cpp:85:3: - # error: cast from ... to ... converts to incompatible function type [-Werror,-Wcast-function-type-strict] - ++ lib.optionals (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16") [ - "-Wno-error=cast-function-type-strict" - # Suppresses the most spammy warnings. - # This is mainly to fix https://github.com/NixOS/nixpkgs/issues/266895. - ] - ++ lib.optionals rocmSupport [ - "-Wno-#warnings" - "-Wno-cpp" - "-Wno-unknown-warning-option" - "-Wno-ignored-attributes" - "-Wno-deprecated-declarations" - "-Wno-defaulted-function-deleted" - "-Wno-pass-failed" - ] - ++ [ - "-Wno-unused-command-line-argument" - "-Wno-uninitialized" - "-Wno-array-bounds" - "-Wno-free-nonheap-object" - "-Wno-unused-result" - ] - ++ lib.optionals stdenv.cc.isGNU [ - "-Wno-maybe-uninitialized" - "-Wno-stringop-overflow" - ] - ) - ); + env = + { + # Suppress a weird warning in mkl-dnn, part of ideep in pytorch + # (upstream seems to have fixed this in the wrong place?) + # https://github.com/intel/mkl-dnn/commit/8134d346cdb7fe1695a2aa55771071d455fae0bc + # https://github.com/pytorch/pytorch/issues/22346 + # + # Also of interest: pytorch ignores CXXFLAGS uses CFLAGS for both C and C++: + # https://github.com/pytorch/pytorch/blob/v1.11.0/setup.py#L17 + NIX_CFLAGS_COMPILE = toString ( + ( + lib.optionals (blas.implementation == "mkl") [ "-Wno-error=array-bounds" ] + # Suppress gcc regression: avx512 math function raises uninitialized variable warning + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105593 + # See also: Fails to compile with GCC 12.1.0 https://github.com/pytorch/pytorch/issues/77939 + ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12.0.0") [ + "-Wno-error=maybe-uninitialized" + "-Wno-error=uninitialized" + ] + # Since pytorch 2.0: + # gcc-12.2.0/include/c++/12.2.0/bits/new_allocator.h:158:33: error: ‘void operator delete(void*, std::size_t)’ + # ... called on pointer ‘’ with nonzero offset [1, 9223372036854775800] [-Werror=free-nonheap-object] + ++ lib.optionals (stdenv.cc.isGNU && lib.versions.major stdenv.cc.version == "12") [ + "-Wno-error=free-nonheap-object" + ] + # .../source/torch/csrc/autograd/generated/python_functions_0.cpp:85:3: + # error: cast from ... to ... converts to incompatible function type [-Werror,-Wcast-function-type-strict] + ++ lib.optionals (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16") [ + "-Wno-error=cast-function-type-strict" + # Suppresses the most spammy warnings. + # This is mainly to fix https://github.com/NixOS/nixpkgs/issues/266895. + ] + ++ lib.optionals rocmSupport [ + "-Wno-#warnings" + "-Wno-cpp" + "-Wno-unknown-warning-option" + "-Wno-ignored-attributes" + "-Wno-deprecated-declarations" + "-Wno-defaulted-function-deleted" + "-Wno-pass-failed" + ] + ++ [ + "-Wno-unused-command-line-argument" + "-Wno-uninitialized" + "-Wno-array-bounds" + "-Wno-free-nonheap-object" + "-Wno-unused-result" + ] + ++ lib.optionals stdenv.cc.isGNU [ + "-Wno-maybe-uninitialized" + "-Wno-stringop-overflow" + ] + ) + ); + + USE_VULKAN = setBool vulkanSupport; + } + // lib.optionalAttrs vulkanSupport { + VULKAN_SDK = shaderc.bin; + }; nativeBuildInputs = [ @@ -530,31 +543,37 @@ buildPythonPackage rec { pythonRelaxDeps = [ "sympy" ]; - dependencies = [ - astunparse - cffi - click - numpy - pyyaml - - # From install_requires: - fsspec - filelock - typing-extensions - sympy - networkx - jinja2 - - # the following are required for tensorboard support - pillow - six - future - tensorboard - protobuf - - # torch/csrc requires `pybind11` at runtime - pybind11 - ] ++ lib.optionals tritonSupport [ _tritonEffective ]; + dependencies = + [ + astunparse + cffi + click + numpy + pyyaml + + # From install_requires: + fsspec + filelock + typing-extensions + sympy + networkx + jinja2 + + # the following are required for tensorboard support + pillow + six + future + tensorboard + protobuf + + # torch/csrc requires `pybind11` at runtime + pybind11 + ] + ++ lib.optionals tritonSupport [ _tritonEffective ] + ++ lib.optionals vulkanSupport [ + vulkan-headers + vulkan-loader + ]; propagatedCxxBuildInputs = [ ] ++ lib.optionals MPISupport [ mpi ] ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9186cb823ea35..547f2e45ef972 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15810,6 +15810,10 @@ self: super: with self; { rocmSupport = false; }; + torchWithVulkan = self.torch.override { + vulkanSupport = true; + }; + torch-tb-profiler = callPackage ../development/python-modules/torch-tb-profiler/default.nix { }; torchaudio = callPackage ../development/python-modules/torchaudio { }; From 18457266102f9170c05dda46f9f90665be29c832 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sat, 24 Aug 2024 02:01:36 -0400 Subject: [PATCH 014/146] chars: add updateScript Co-authored-by: Sefa Eyeoglu --- pkgs/tools/text/chars/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/text/chars/default.nix b/pkgs/tools/text/chars/default.nix index 509953e8059b1..e56f10c7406a6 100644 --- a/pkgs/tools/text/chars/default.nix +++ b/pkgs/tools/text/chars/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , rustPlatform , Security +, nix-update-script }: rustPlatform.buildRustPackage rec { @@ -19,6 +20,10 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + passthru = { + updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + }; + meta = with lib; { description = "Commandline tool to display information about unicode characters"; mainProgram = "chars"; From f6559fcbae206a96dbe309c2edd2cf029c6d87a3 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sat, 24 Aug 2024 01:58:17 -0400 Subject: [PATCH 015/146] angle-grinder: add updateScript Co-authored-by: Sefa Eyeoglu --- pkgs/by-name/an/angle-grinder/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/an/angle-grinder/package.nix b/pkgs/by-name/an/angle-grinder/package.nix index 322cd12463c85..5f07a4c2c0880 100644 --- a/pkgs/by-name/an/angle-grinder/package.nix +++ b/pkgs/by-name/an/angle-grinder/package.nix @@ -1,6 +1,7 @@ { lib , fetchFromGitHub , rustPlatform +, nix-update-script }: rustPlatform.buildRustPackage rec { @@ -16,6 +17,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-+l0+zaZSPOk4gJLHZ9LFFbYlZ5vkS68Jg2dWPHSkzKw="; + passthru = { + updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + }; + meta = with lib; { description = "Slice and dice logs on the command line"; homepage = "https://github.com/rcoh/angle-grinder"; From bd0c863eb4c27b20716022d51dc630f04b7d6384 Mon Sep 17 00:00:00 2001 From: Thomas Gebert Date: Tue, 12 Nov 2024 22:50:24 -0500 Subject: [PATCH 016/146] lightworks: 2023.2 -> 2025.1 --- pkgs/by-name/li/lightworks/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/lightworks/package.nix b/pkgs/by-name/li/lightworks/package.nix index 5ecd39de3d931..867819f532725 100644 --- a/pkgs/by-name/li/lightworks/package.nix +++ b/pkgs/by-name/li/lightworks/package.nix @@ -25,6 +25,8 @@ libvdpau, twolame, gmp, + libdrm, + libpulseaudio, }: let fullPath = lib.makeLibraryPath [ @@ -49,18 +51,20 @@ let libvdpau twolame gmp + libdrm + libpulseaudio ]; lightworks = stdenv.mkDerivation rec { - version = "2023.2"; - rev = "146752"; + version = "2025.1"; + rev = "148287"; pname = "lightworks"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://cdn.lwks.com/releases/${version}/lightworks_${version}_r${rev}.deb"; - sha256 = "sha256-Xjcqdhe85YdPX8AHpKmo/K77AURg0JvtqIvilQOV2ek="; + sha256 = "sha256-opYbWzZYim5wqSaxDeGmc10XxFkkE521PDB8OULh7Jc="; } else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; From cb2831b4077ad6fea0808e7e75aed9a5fcbeaa40 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Wed, 13 Nov 2024 22:47:43 +0100 Subject: [PATCH 017/146] jedit: 5.6.0-unstable-2023-11-19 -> 5.7.0 --- pkgs/by-name/je/jedit/package.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/je/jedit/package.nix b/pkgs/by-name/je/jedit/package.nix index a2ea101d61c38..43949e0df605d 100644 --- a/pkgs/by-name/je/jedit/package.nix +++ b/pkgs/by-name/je/jedit/package.nix @@ -12,13 +12,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "jedit"; - version = "5.6.0-unstable-2023-11-19"; + version = "5.7.0"; - src = fetchsvn { - url = "https://svn.code.sf.net/p/jedit/svn/jEdit/trunk"; - rev = "25703"; - hash = "sha256-z1KTZqKl6Dlqayw/3h/JvHQK3kSfio02R8V6aCb4g4Q="; - }; + src = + let + versionWithDashes = lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version; + in + fetchsvn { + url = "https://svn.code.sf.net/p/jedit/svn/jEdit/tags/jedit-${versionWithDashes}"; + hash = "sha256-XfYK2C0QZrg4b//1eQcUNViRthBbXV+cbcYetzw2RG8="; + }; ivyDeps = stdenv.mkDerivation { name = "${finalAttrs.pname}-${finalAttrs.version}-ivy-deps"; @@ -58,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-J5i5IhXlXw84y/4K6Vt84au4eVXVLupmtfscO+y1Fi0="; + outputHash = "sha256-NGSBGB7q0HpOpajJV68K0rqCOqFYNrZHsnUHW+1GSLs="; }; # ignore a test failing because of the build environment @@ -104,8 +107,9 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { + changelog = "${finalAttrs.src.url}/doc/CHANGES.txt"; description = "Programmer's text editor written in Java"; - homepage = "http://www.jedit.org"; + homepage = "https://www.jedit.org"; license = lib.licenses.gpl2Only; mainProgram = "jedit"; maintainers = with lib.maintainers; [ tomasajt ]; From f543565191f1e794ead1c0a4185febc6c544ea97 Mon Sep 17 00:00:00 2001 From: Erno Hopearuoho Date: Sun, 6 Oct 2024 13:27:00 +0300 Subject: [PATCH 018/146] coroot-node-agent: init at 1.22.2 --- pkgs/by-name/co/coroot-node-agent/package.nix | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/co/coroot-node-agent/package.nix diff --git a/pkgs/by-name/co/coroot-node-agent/package.nix b/pkgs/by-name/co/coroot-node-agent/package.nix new file mode 100644 index 0000000000000..2cad39afda69d --- /dev/null +++ b/pkgs/by-name/co/coroot-node-agent/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + systemdLibs, +}: + +buildGoModule rec { + pname = "coroot-node-agent"; + version = "1.22.2"; + + src = fetchFromGitHub { + owner = "coroot"; + repo = "coroot-node-agent"; + rev = "v${version}"; + hash = "sha256-b9JI0q6CF4D+sdfuwTkouAwJF/ghJByzsQBehwXttoU="; + }; + + vendorHash = "sha256-OZj3t8eFDbk2zZ+zGlgV8o9VC4/vYalIEm2dhD2JwK8="; + + buildInputs = [ systemdLibs ]; + + CGO_CFLAGS = "-I ${systemdLibs}/include"; + + meta = { + description = "Prometheus exporter based on eBPF"; + homepage = "https://github.com/coroot/coroot-node-agent"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ errnoh ]; + mainProgram = "coroot-node-agent"; + }; +} From 20d91e0545716ed2b215f6be05a9a29d045c246f Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Mon, 28 Aug 2023 10:27:08 -0700 Subject: [PATCH 019/146] misc-gitology: init at unstable-2024-08-26 https://blog.aloni.org/posts/gitology-1-git-flip-history/ https://github.com/da-x/misc-gitology --- pkgs/by-name/mi/misc-gitology/package.nix | 45 +++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/mi/misc-gitology/package.nix diff --git a/pkgs/by-name/mi/misc-gitology/package.nix b/pkgs/by-name/mi/misc-gitology/package.nix new file mode 100644 index 0000000000000..c3365b575a8a6 --- /dev/null +++ b/pkgs/by-name/mi/misc-gitology/package.nix @@ -0,0 +1,45 @@ +{ + stdenv, + lib, + fetchFromGitHub, + nix-update-script, + perl, + python3, +}: +stdenv.mkDerivation { + pname = "misc-gitology"; + version = "unstable-2024-08-26"; + + src = fetchFromGitHub { + owner = "da-x"; + repo = "misc-gitology"; + rev = "8f6b200ed5f4d39f86026cf050f325d5f5713950"; + hash = "sha256-6LoMJUOyBpP1HvVXNahEQlN1JKC9KflcOH9QWIi4M6s="; + }; + + dontBuild = true; + + buildInputs = [ + python3 + # For `git-find-blob`: + perl + ]; + + installPhase = '' + mkdir -p $out/bin + find . \ + -type f \ + -executable \ + -maxdepth 1 \ + -exec install --target-directory=$out/bin/ {} + + ''; + + meta = with lib; { + description = "Assortment of scripts around Git"; + homepage = "https://github.com/da-x/misc-gitology"; + license = [ licenses.bsd2 ]; + maintainers = [ maintainers._9999years ]; + }; + + passthru.updateScript = nix-update-script { }; +} From 7c4d31d327f88f88258e69beaed6aec3c35b5d61 Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Mon, 25 Nov 2024 10:09:02 -0800 Subject: [PATCH 020/146] misc-gitology: Versions start with a digit Co-authored-by: Arne Keller <2012gdwu+github@posteo.de> --- pkgs/by-name/mi/misc-gitology/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mi/misc-gitology/package.nix b/pkgs/by-name/mi/misc-gitology/package.nix index c3365b575a8a6..0f13d229b2cf5 100644 --- a/pkgs/by-name/mi/misc-gitology/package.nix +++ b/pkgs/by-name/mi/misc-gitology/package.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation { pname = "misc-gitology"; - version = "unstable-2024-08-26"; + version = "0-unstable-2024-08-26"; src = fetchFromGitHub { owner = "da-x"; From 81909529585a906d6495376dc1d991a11c6a1db1 Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Mon, 25 Nov 2024 10:09:21 -0800 Subject: [PATCH 021/146] misc-gitology: Run preInstall/postInstall hooks Co-authored-by: Arne Keller <2012gdwu+github@posteo.de> --- pkgs/by-name/mi/misc-gitology/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/mi/misc-gitology/package.nix b/pkgs/by-name/mi/misc-gitology/package.nix index 0f13d229b2cf5..a8d633d4874fe 100644 --- a/pkgs/by-name/mi/misc-gitology/package.nix +++ b/pkgs/by-name/mi/misc-gitology/package.nix @@ -26,12 +26,14 @@ stdenv.mkDerivation { ]; installPhase = '' + runHook preInstall mkdir -p $out/bin find . \ -type f \ -executable \ -maxdepth 1 \ -exec install --target-directory=$out/bin/ {} + + runHook postInstall ''; meta = with lib; { From 3c71f72eed9b22e67e4aaf01355e02b8ed38b39a Mon Sep 17 00:00:00 2001 From: unlsycn Date: Tue, 12 Nov 2024 11:50:56 +0000 Subject: [PATCH 022/146] sv-lang: 3.0 -> 7.0 Signed-off-by: unlsycn --- pkgs/by-name/sv/sv-lang/package.nix | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/sv/sv-lang/package.nix b/pkgs/by-name/sv/sv-lang/package.nix index 2bc5059b8b80e..20cd12dc2fd5c 100644 --- a/pkgs/by-name/sv/sv-lang/package.nix +++ b/pkgs/by-name/sv/sv-lang/package.nix @@ -5,36 +5,20 @@ , catch2_3 , cmake , ninja -, fmt_9 +, fmt_11 +, mimalloc , 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"; + version = "7.0"; src = fetchFromGitHub { owner = "MikePopoloski"; repo = "slang"; rev = "v${version}"; - sha256 = "sha256-v2sStvukLFMRXGeATxvizmnwEPDE4kwnS06n+37OrJA="; + sha256 = "sha256-msSc6jw2xbEZfOwtqwFEDIKcwf5SDKp+j15lVbNO98g="; }; cmakeFlags = [ @@ -52,9 +36,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - unordered_dense boost182 - fmt_9 + fmt_11 + mimalloc # though only used in tests, cmake will complain its absence when configuring catch2_3 ]; @@ -70,5 +54,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ sharzy ]; mainProgram = "slang"; platforms = platforms.all; + broken = stdenv.hostPlatform.isDarwin; }; } From 6e367c5670308f3e132a5a11644ca46d4529b12b Mon Sep 17 00:00:00 2001 From: Seong Yong-ju Date: Sun, 17 Nov 2024 02:55:07 +0900 Subject: [PATCH 023/146] siketyan-ghr: init at 0.4.4 --- pkgs/by-name/si/siketyan-ghr/package.nix | 62 ++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 pkgs/by-name/si/siketyan-ghr/package.nix diff --git a/pkgs/by-name/si/siketyan-ghr/package.nix b/pkgs/by-name/si/siketyan-ghr/package.nix new file mode 100644 index 0000000000000..2b0a24c0bbdf4 --- /dev/null +++ b/pkgs/by-name/si/siketyan-ghr/package.nix @@ -0,0 +1,62 @@ +{ + lib, + rustPlatform, + buildPackages, + fetchFromGitHub, + installShellFiles, + pkg-config, + libgit2, + openssl, + stdenv, + zlib, + zstd, +}: + +rustPlatform.buildRustPackage rec { + pname = "ghr"; + version = "0.4.4"; + + src = fetchFromGitHub { + owner = "siketyan"; + repo = "ghr"; + rev = "v${version}"; + hash = "sha256-L9+rcdt+MGZSCOJyCE4t/TT6Fjtxvfr9LBJYyRrx208="; + }; + + cargoHash = "sha256-HBVMDR+3UB+zWmvZXBph36bajTOAnvVGTGYooJtk9Zg="; + + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; + + buildInputs = [ + libgit2 + openssl + zlib + zstd + ]; + + postInstall = + let + ghr = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/ghr"; + in + lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) '' + installShellCompletion --cmd ghr \ + --bash <(${ghr} shell --completion bash) \ + --fish <(${ghr} shell --completion fish) + ''; + + env = { + OPENSSL_NO_VENDOR = true; + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + + meta = with lib; { + description = "Yet another repository management with auto-attaching profiles"; + homepage = "https://github.com/siketyan/ghr"; + license = licenses.mit; + maintainers = with maintainers; [ sei40kr ]; + mainProgram = "ghr"; + }; +} From 65dba705fff86c179ea8fe22cd5ff8be36b6a5cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Dec 2024 03:52:34 +0000 Subject: [PATCH 024/146] ldb: 2.9.1 -> 2.9.2 --- pkgs/by-name/ld/ldb/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ld/ldb/package.nix b/pkgs/by-name/ld/ldb/package.nix index 65fc10c92a70b..763eaa05c6442 100644 --- a/pkgs/by-name/ld/ldb/package.nix +++ b/pkgs/by-name/ld/ldb/package.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ldb"; - version = "2.9.1"; + version = "2.9.2"; src = fetchurl { url = "mirror://samba/ldb/ldb-${finalAttrs.version}.tar.gz"; - hash = "sha256-yV5Nwy3qiGS3mJnuNAyf3yi0hvRku8OLqZFRoItJP5s="; + hash = "sha256-0VWIQALHnbscPYZC+LEBPy5SCzru/W6WQSrexbjWy8A="; }; outputs = [ "out" "dev" ]; From 46ac60f1b0e7deacff900bdd81af561bc61e55f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Dec 2024 10:55:01 +0000 Subject: [PATCH 025/146] ocamlPackages.lwt: 5.8.0 -> 5.9.0 --- pkgs/development/ocaml-modules/lwt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index e8cf9e4f85ba6..6d0a1f3d95d18 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.8.0"; + version = "5.9.0"; minimalOCamlVersion = "4.08"; @@ -12,7 +12,7 @@ buildDunePackage rec { owner = "ocsigen"; repo = "lwt"; rev = version; - hash = "sha256-GX5CSJuTajvZJ0TgG95aHeOCBi2B9Aw2URLZRCdp91A="; + hash = "sha256-xYF+f489RI/nY0J48qW0jtq5GEnk68QnwxzBV2TLmLk="; }; nativeBuildInputs = [ cppo ]; From c22957c77833972979791a3dc189f5504bd6363f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 22:43:45 +0000 Subject: [PATCH 026/146] tdb: 1.4.11 -> 1.4.12 --- pkgs/by-name/td/tdb/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/td/tdb/package.nix b/pkgs/by-name/td/tdb/package.nix index a42bb92cda13f..81e663908d1d3 100644 --- a/pkgs/by-name/td/tdb/package.nix +++ b/pkgs/by-name/td/tdb/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "tdb"; - version = "1.4.11"; + version = "1.4.12"; src = fetchurl { url = "mirror://samba/tdb/${pname}-${version}.tar.gz"; - hash = "sha256-Toum2T84NWW70GG+Te7hUxgjLRu8ynIS8Y4X9Wu5dag="; + hash = "sha256-bOSydJiBLQkjfs5loNbfrAlBYQ5wmEjsuCKqJBCEzXo="; }; nativeBuildInputs = [ From 62601ddfc36eb1bc7674c586a49a92a4b243e08d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 08:25:18 +0000 Subject: [PATCH 027/146] bmake: 20240921 -> 20241124 --- pkgs/by-name/bm/bmake/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix index 05729f8aa8480..27e75d875a7c3 100644 --- a/pkgs/by-name/bm/bmake/package.nix +++ b/pkgs/by-name/bm/bmake/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bmake"; - version = "20240921"; + version = "20241124"; src = fetchurl { url = "https://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-s0ZXnoLSltGk2ineqFlOPuWWEwsgeG3sDziZo+ESdcI="; + hash = "sha256-T2ZAYJHC+F6pZLI41p649xq0uqydykaHpxiDum3k3bI="; }; patches = [ From 012386585546bc314563db23d7c2db9fe03d8641 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Fri, 6 Dec 2024 12:43:47 +0100 Subject: [PATCH 028/146] cudaPackages.nccl-tests: 2.13.10 -> 2.13.11 --- pkgs/development/cuda-modules/nccl-tests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/cuda-modules/nccl-tests/default.nix b/pkgs/development/cuda-modules/nccl-tests/default.nix index f230dc8fdb418..7747433788b3f 100644 --- a/pkgs/development/cuda-modules/nccl-tests/default.nix +++ b/pkgs/development/cuda-modules/nccl-tests/default.nix @@ -25,13 +25,13 @@ in backendStdenv.mkDerivation (finalAttrs: { pname = "nccl-tests"; - version = "2.13.10"; + version = "2.13.11"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nccl-tests"; rev = "v${finalAttrs.version}"; - hash = "sha256-H9shp4fYW+dlyL9FZRxX761UCFR/pOBKNHfVme2TfJg="; + hash = "sha256-HHshp4fYW+dlyL9FZRxX761UCFR/pOBKNHfVme2TfJg="; }; strictDeps = true; From 0feebd4a76451724f434662b12d184345e77c341 Mon Sep 17 00:00:00 2001 From: TheSola10 Date: Fri, 8 Nov 2024 15:12:23 +0100 Subject: [PATCH 029/146] ostree: add composefs support --- pkgs/by-name/os/ostree-full/package.nix | 7 +++++++ pkgs/by-name/os/ostree/package.nix | 8 ++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/by-name/os/ostree-full/package.nix diff --git a/pkgs/by-name/os/ostree-full/package.nix b/pkgs/by-name/os/ostree-full/package.nix new file mode 100644 index 0000000000000..c1c4d952b7e3b --- /dev/null +++ b/pkgs/by-name/os/ostree-full/package.nix @@ -0,0 +1,7 @@ +{ + ostree, +}: + +ostree.override { + withComposefs = true; +} diff --git a/pkgs/by-name/os/ostree/package.nix b/pkgs/by-name/os/ostree/package.nix index dff3820b4112e..3bed8333cb255 100644 --- a/pkgs/by-name/os/ostree/package.nix +++ b/pkgs/by-name/os/ostree/package.nix @@ -33,6 +33,10 @@ , docbook-xsl-nons , docbook_xml_dtd_42 , python3 + + # Optional ComposeFS support +, withComposefs ? false +, composefs }: let @@ -87,6 +91,8 @@ in stdenv.mkDerivation rec { # for installed tests testPython gjs + ] ++ lib.optionals withComposefs [ + (lib.getDev composefs) ]; enableParallelBuilding = true; @@ -97,6 +103,8 @@ in stdenv.mkDerivation rec { "--with-systemdsystemgeneratordir=${placeholder "out"}/lib/systemd/system-generators" "--enable-installed-tests" "--with-ed25519-libsodium" + ] ++ lib.optionals withComposefs [ + "--with-composefs" ]; makeFlags = [ From 3534991cf8db4988ddecc0b3a8e89b0f53f57179 Mon Sep 17 00:00:00 2001 From: TheSola10 Date: Fri, 8 Nov 2024 15:12:38 +0100 Subject: [PATCH 030/146] bootc: add composefs support --- pkgs/by-name/bo/bootc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bo/bootc/package.nix b/pkgs/by-name/bo/bootc/package.nix index 164f428b4830b..407864291e4d1 100644 --- a/pkgs/by-name/bo/bootc/package.nix +++ b/pkgs/by-name/bo/bootc/package.nix @@ -7,7 +7,7 @@ pkg-config, openssl, glib, - ostree, + ostree-full, versionCheckHook, }: @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { zstd openssl glib - ostree + ostree-full ]; nativeInstallCheckInputs = [ From b6f4b380a696787de56135c19e890a4d60a8ad99 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Thu, 12 Dec 2024 16:18:47 +0100 Subject: [PATCH 031/146] matomo: default to 5.x, drop 4.x --- .../manual/release-notes/rl-2505.section.md | 2 ++ nixos/tests/matomo.nix | 27 +++++++------------ .../matomo/change-path-geoip2-4.x.patch | 10 ------- pkgs/servers/web-apps/matomo/default.nix | 11 +------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 6 files changed, 13 insertions(+), 39 deletions(-) delete mode 100644 pkgs/servers/web-apps/matomo/change-path-geoip2-4.x.patch diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index a24092c84d6b8..b58656432a2ea 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -110,6 +110,8 @@ - `virtualisation.azure.agent` option provided by `azure-agent.nix` is replaced by `services.waagent`, and will be removed in a future release. +- `matomo` now defaults to version 5 (previously available as `matomo_5`). Version 4 has been removed as it reached EOL on December 19, 2024. + - `containerd` has been updated to v2, which contains breaking changes. See the [containerd 2.0](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) documentation for more details. diff --git a/nixos/tests/matomo.nix b/nixos/tests/matomo.nix index f4097db6805db..35c71aa088538 100644 --- a/nixos/tests/matomo.nix +++ b/nixos/tests/matomo.nix @@ -48,24 +48,6 @@ in { matomo = matomoTest pkgs.matomo // { name = "matomo"; - meta.maintainers = with maintainers; [ - florianjacob - mmilata - twey - boozedog - ]; - }; - matomo-beta = matomoTest pkgs.matomo-beta // { - name = "matomo-beta"; - meta.maintainers = with maintainers; [ - florianjacob - mmilata - twey - boozedog - ]; - }; - matomo_5 = matomoTest pkgs.matomo_5 // { - name = "matomo-5"; meta.maintainers = with maintainers; [ @@ -76,4 +58,13 @@ in ] ++ lib.teams.flyingcircus.members; }; + matomo-beta = matomoTest pkgs.matomo-beta // { + name = "matomo-beta"; + meta.maintainers = with maintainers; [ + florianjacob + mmilata + twey + boozedog + ]; + }; } diff --git a/pkgs/servers/web-apps/matomo/change-path-geoip2-4.x.patch b/pkgs/servers/web-apps/matomo/change-path-geoip2-4.x.patch deleted file mode 100644 index 5e3b32f2ef8c8..0000000000000 --- a/pkgs/servers/web-apps/matomo/change-path-geoip2-4.x.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/plugins/GeoIp2/config/config.php -+++ b/plugins/GeoIp2/config/config.php -@@ -1,6 +1,6 @@ - DI\string('{path.root}/misc/'), -+ 'path.geoip2' => PIWIK_USER_PATH . '/misc/', - 'geopip2.ispEnabled' => true - ]; diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 36c1aeef90d1b..516afd99cadb3 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -10,10 +10,6 @@ let versions = { matomo = { - version = "4.16.1"; - hash = "sha256-cGnsxfpvt7FyhxFcA2/gWWe7CyanVGZVKtCDES3XLdI="; - }; - matomo_5 = { version = "5.1.2"; hash = "sha256-6kR6OOyqwQfV+pRqHO+VMLM1eZQb0om65EilAnIlW9U="; }; @@ -53,12 +49,7 @@ let ./make-localhost-default-database-host.patch # This changes the default config for path.geoip2 so that it doesn't point # to the nix store. - ( - if lib.versionOlder finalAttrs.version "5.0" then - ./change-path-geoip2-4.x.patch - else - ./change-path-geoip2-5.x.patch - ) + ./change-path-geoip2-5.x.patch ]; # this bootstrap.php adds support for getting PIWIK_USER_PATH diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b545420485728..9360913a9a5b0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -796,6 +796,7 @@ mapAliases { mathematica9 = throw "mathematica9 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20 mathematica10 = throw "mathematica10 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20 mathematica11 = throw "mathematica11 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20 + matomo_5 = matomo; # Added 2024-12-12 matrique = throw "'matrique' has been renamed to/replaced by 'spectral'"; # Converted to throw 2024-10-17 matrix-sliding-sync = throw "matrix-sliding-sync has been removed as matrix-synapse 114.0 and later covers its functionality"; # Added 2024-10-20 maui-nota = libsForQt5.mauiPackages.nota; # added 2022-05-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0734f779f0aa9..e4992a8e67231 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12134,7 +12134,6 @@ with pkgs; tt-rss = callPackage ../servers/tt-rss { }; inherit (callPackages ../servers/web-apps/matomo {}) matomo - matomo_5 matomo-beta; unpackerr = callPackage ../servers/unpackerr { From 37ccca21163ade037b4e9fffa3dfe585f78535e7 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Thu, 12 Dec 2024 16:26:54 +0100 Subject: [PATCH 032/146] matomo: 5.1.2 -> 5.2.0 --- pkgs/servers/web-apps/matomo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 516afd99cadb3..3eb4c2a8113a4 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -10,15 +10,15 @@ let versions = { matomo = { - version = "5.1.2"; - hash = "sha256-6kR6OOyqwQfV+pRqHO+VMLM1eZQb0om65EilAnIlW9U="; + version = "5.2.0"; + hash = "sha256-0hMbcvntoOWFJ00DytkFfcP7/giqtrhmxawVNzMP2KA="; }; matomo-beta = { version = "5.2.0"; # `beta` examples: "b1", "rc1", null # when updating: use null if stable version is >= latest beta or release candidate - beta = "rc1"; - hash = "sha256-heAd01p8QHkrxQY2MEf//YXNplgL19Opw/WhA2cwZ+c="; + beta = null; + hash = "sha256-0hMbcvntoOWFJ00DytkFfcP7/giqtrhmxawVNzMP2KA="; }; }; common = From a04ba402ddf61b336295cd5621889d9873c285c1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 13 Dec 2024 12:37:41 +0100 Subject: [PATCH 033/146] =?UTF-8?q?coqPackages.compcert:=203.14=20?= =?UTF-8?q?=E2=86=92=203.15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/compcert/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 4adfa5698cf86..b24a2ea371762 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -42,7 +42,7 @@ let lib.switch coq.version [ { case = range "8.14" "8.20"; - out = "3.14"; + out = "3.15"; } { case = isEq "8.13"; @@ -67,6 +67,7 @@ let "3.13".sha256 = "sha256-ZedxgEPr1ZgKIcyhQ6zD1l2xr6RDNNUYq/4ZyR6ojM4="; "3.13.1".sha256 = "sha256-ldXbuzVB0Z+UVTd5S4yGSg6oRYiKbXLMmUZcQsJLcns="; "3.14".sha256 = "sha256-QXJMpp/BaPiK5okHeo2rcmXENToXKjB51UqljMHTDgw="; + "3.15".sha256 = "sha256-QFTueGZd0hAWUj+c5GZL/AyNpfN4FuJiIzCICmwRXJ8="; }; strictDeps = true; From 904ffed79eccc1adb4d6ba3176a7ff08d2d86555 Mon Sep 17 00:00:00 2001 From: lilly Date: Wed, 30 Oct 2024 21:27:47 +0100 Subject: [PATCH 034/146] nm-file-secret-agent: init at v1.0.0 A small program that can provide secrets based on configured files contents to NetworkManager. This allows protected values to be stored outside of the profile definitions while still configuring the connection itself declaratively. For more information and use-case description see https://git.lly.sh/lilly/nm-file-secret-agent --- .../nm/nm-file-secret-agent/package.nix | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 pkgs/by-name/nm/nm-file-secret-agent/package.nix diff --git a/pkgs/by-name/nm/nm-file-secret-agent/package.nix b/pkgs/by-name/nm/nm-file-secret-agent/package.nix new file mode 100644 index 0000000000000..beef2962e9033 --- /dev/null +++ b/pkgs/by-name/nm/nm-file-secret-agent/package.nix @@ -0,0 +1,34 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + dbus, + networkmanager, + pkg-config, + nix-update-script, +}: +rustPlatform.buildRustPackage rec { + name = "nm-file-secret-agent"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "lilioid"; + repo = "nm-file-secret-agent"; + rev = "v${version}"; + hash = "sha256-5L4bhf6nsINZD+oINC1f71P2cebPG7bzDYtlsU8UMMk="; + }; + cargoHash = "sha256-SlYz55hc9HEueN7AYVpqadxQjI0hERcdQSJ7rEPnbVE="; + buildInputs = [ dbus ]; + nativeBuildInputs = [ pkg-config ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "NetworkManager secret agent that responds with the content of preconfigured files"; + mainProgram = "nm-file-secret-agent"; + homepage = "https://github.com/lilioid/nm-file-secret-agent/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lilioid ]; + platforms = lib.lists.intersectLists dbus.meta.platforms networkmanager.meta.platforms; + }; +} From 77a69f54eda641932a54d0eb014b892df66f5625 Mon Sep 17 00:00:00 2001 From: Antoine Labarussias Date: Sat, 14 Dec 2024 14:14:18 +0100 Subject: [PATCH 035/146] omnictl: 0.38.3 -> 0.44.1 --- pkgs/by-name/om/omnictl/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix index c7669b06b4189..e870792172f11 100644 --- a/pkgs/by-name/om/omnictl/package.nix +++ b/pkgs/by-name/om/omnictl/package.nix @@ -7,23 +7,23 @@ buildGoModule rec { pname = "omnictl"; - version = "0.38.3"; + version = "0.44.1"; src = fetchFromGitHub { owner = "siderolabs"; repo = "omni"; rev = "v${version}"; - hash = "sha256-8AqXF7bBgn8br3mooh1BHvN2wWQnmpvVeBHbbJ5shGA="; + hash = "sha256-+yN2s8LQbOlN1vkovU0pEl5O9s8NZ8u0TYMh2bTbYCM="; }; - vendorHash = "sha256-BF/F/siVIYJT4abOlwQjpnQpmNFdOo566VGPIo08PO0="; + vendorHash = "sha256-5K2ZmWYU8+M044mzrqYJv1aZ/E7aRsFWfq19W658SZ4="; ldflags = [ "-s" "-w" ]; - GOWORK = "off"; + env.GOWORK = "off"; subPackages = [ "cmd/omnictl" ]; From 44dc31e67631169c80b1d82afa27fab8010d6aca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 12 Dec 2024 13:23:06 +0100 Subject: [PATCH 036/146] ci/eval/compare: truncate step summary to 1024k --- ci/eval/compare/generate-step-summary.jq | 27 ++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/ci/eval/compare/generate-step-summary.jq b/ci/eval/compare/generate-step-summary.jq index 28597eaec371f..961877cd27974 100644 --- a/ci/eval/compare/generate-step-summary.jq +++ b/ci/eval/compare/generate-step-summary.jq @@ -4,12 +4,27 @@ def truncate(xs; n): end; def itemize_packages(xs): - # we truncate the list to stay below the GitHub limit of 1MB per step summary. - truncate(xs; 3000) | map("- [\(.)](https://search.nixos.org/packages?channel=unstable&show=\(.)&from=0&size=50&sort=relevance&type=packages&query=\(.))") | join("\n"); + truncate(xs; 2000) | + map("- [\(.)](https://search.nixos.org/packages?channel=unstable&show=\(.)&from=0&size=50&sort=relevance&type=packages&query=\(.))") | + join("\n"); + +def get_title(s; xs): + s + " (" + (xs | length | tostring) + ")"; def section(title; xs): - "
" + title + " (" + (xs | length | tostring) + ")\n\n" + itemize_packages(xs) + "
"; + "
" + get_title(title; xs) + "\n\n" + itemize_packages(xs) + "
"; + +def fallback_document(content; n): + if content | utf8bytelength > n then + get_title("Added packages"; .attrdiff.added) + "\n\n" + + get_title("Removed packages"; .attrdiff.removed) + "\n\n" + + get_title("Changed packages"; .attrdiff.changed) + else content + end; -section("Added packages"; .attrdiff.added) + "\n\n" + -section("Removed packages"; .attrdiff.removed) + "\n\n" + -section("Changed packages"; .attrdiff.changed) +# we truncate the list to stay below the GitHub limit of 1MB per step summary. +fallback_document( + section("Added packages"; .attrdiff.added) + "\n\n" + + section("Removed packages"; .attrdiff.removed) + "\n\n" + + section("Changed packages"; .attrdiff.changed); 1000 * 1000 +) From 4329adeac6f270d9c546ce26ebc1bf7a32ecb658 Mon Sep 17 00:00:00 2001 From: Troels Henriksen Date: Tue, 17 Dec 2024 13:03:34 +0100 Subject: [PATCH 037/146] adolc: add --enable-sparse to configureFlags --- pkgs/by-name/ad/adolc/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ad/adolc/package.nix b/pkgs/by-name/ad/adolc/package.nix index 31955562a7679..96ac820471a2a 100644 --- a/pkgs/by-name/ad/adolc/package.nix +++ b/pkgs/by-name/ad/adolc/package.nix @@ -16,7 +16,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-oU229SuOl/gHoRT8kiWfd5XFiByjeypgdVWFLMYFHfA="; }; - configureFlags = [ "--with-openmp-flag=-fopenmp" ]; + configureFlags = [ + "--with-openmp-flag=-fopenmp" + "--enable-sparse" + ]; buildInputs = lib.optional stdenv.cc.isClang llvmPackages.openmp; From 24e0db1ba99d906ca7351031eed248082f2e6e8d Mon Sep 17 00:00:00 2001 From: lilly Date: Fri, 1 Nov 2024 19:12:59 +0100 Subject: [PATCH 038/146] nixos/networkmanager: add nm-file-secret-agent options nm-file-secret agent is a small agent that can supply secrets of connection profiles to NetworkManager by reading the contents of preconfigured files. These files could be supplied e.g. by nixos-sops or any other mechanism. --- nixos/modules/module-list.nix | 1 + .../networking/nm-file-secret-agent.nix | 131 ++++++++++++++++++ 2 files changed, 132 insertions(+) create mode 100644 nixos/modules/services/networking/nm-file-secret-agent.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a014c93afedec..514e006111ee6 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1146,6 +1146,7 @@ ./services/networking/nixops-dns.nix ./services/networking/nncp.nix ./services/networking/nntp-proxy.nix + ./services/networking/nm-file-secret-agent.nix ./services/networking/nomad.nix ./services/networking/nsd.nix ./services/networking/ntopng.nix diff --git a/nixos/modules/services/networking/nm-file-secret-agent.nix b/nixos/modules/services/networking/nm-file-secret-agent.nix new file mode 100644 index 0000000000000..8d9b8fee3c542 --- /dev/null +++ b/nixos/modules/services/networking/nm-file-secret-agent.nix @@ -0,0 +1,131 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.networking.networkmanager; + toml = pkgs.formats.toml { }; + + enabled = (lib.length cfg.ensureProfiles.secrets.entries) > 0; + + nmFileSecretAgentConfig = { + entry = builtins.map ( + i: + { + key = i.key; + file = i.file; + } + // lib.optionalAttrs (i.matchId != null) { match_id = i.matchId; } + // lib.optionalAttrs (i.matchUuid != null) { match_uuid = i.matchUuid; } + // lib.optionalAttrs (i.matchType != null) { match_type = i.matchType; } + // lib.optionalAttrs (i.matchIface != null) { match_iface = i.matchIface; } + // lib.optionalAttrs (i.matchSetting != null) { + match_setting = i.matchSetting; + } + ) cfg.ensureProfiles.secrets.entries; + }; + nmFileSecretAgentConfigFile = toml.generate "config.toml" nmFileSecretAgentConfig; +in +{ + meta = { + maintainers = [ lib.maintainers.lilioid ]; + }; + + ####### interface + options = { + networking.networkmanager.ensureProfiles.secrets = { + package = lib.mkPackageOption pkgs "nm-file-secret-agent" { }; + entries = lib.mkOption { + description = '' + A list of secrets to provide to NetworkManager by reading their values from configured files. + + Note that NetworkManager should be configured to read secrets from a secret agent. + This can be done for example through the `networking.networkmanager.ensureProfiles.profiles` options. + ''; + default = [ ]; + example = [ + { + matchId = "My WireGuard VPN"; + matchType = "wireguard"; + matchSetting = "wireguard"; + key = "private-key"; + file = "/root/wireguard_key"; + } + ]; + type = lib.types.listOf ( + lib.types.submodule { + options = { + matchId = lib.mkOption { + description = '' + connection id used by NetworkManager. Often displayed as name in GUIs. + + NetworkManager describes this as a human readable unique identifier for the connection, like "Work Wi-Fi" or "T-Mobile 3G". + ''; + type = lib.types.nullOr lib.types.str; + default = null; + example = "wifi1"; + }; + matchUuid = lib.mkOption { + description = '' + UUID of the connection profile + + UUIDs are assigned once on connection creation and should never change as long as the connection still applies to the same network. + ''; + type = lib.types.nullOr lib.types.str; + default = null; + example = "669ea4c9-4cb3-4901-ab52-f9606590976e"; + }; + matchType = lib.mkOption { + description = '' + NetworkManager connection type + + The NetworkManager configuration settings reference roughly corresponds to connection types. + More might be available on your system depending on the installed plugins. + + https://networkmanager.dev/docs/api/latest/ch01.html + ''; + type = lib.types.nullOr lib.types.str; + default = null; + example = "wireguard"; + }; + matchIface = lib.mkOption { + description = "interface name of the NetworkManager connection"; + type = lib.types.nullOr lib.types.str; + default = null; + }; + matchSetting = lib.mkOption { + description = "name of the setting section for which secrets are requested"; + type = lib.types.nullOr lib.types.str; + default = null; + }; + key = lib.mkOption { + description = "key in the setting section for which this entry provides a value"; + type = lib.types.str; + }; + file = lib.mkOption { + description = "file from which the secret value is read"; + type = lib.types.str; + }; + }; + } + ); + }; + }; + }; + + ####### implementation + config = lib.mkIf enabled { + # start nm-file-secret-agent if required + systemd.services."nm-file-secret-agent" = { + description = "NetworkManager secret agent that responds with the content of preconfigured files"; + documentation = [ "https://github.com/lilioid/nm-file-secret-agent/" ]; + requires = [ "NetworkManager.service" ]; + after = [ "NetworkManager.service" ]; + wantedBy = [ "multi-user.target" ]; + restartTriggers = [ nmFileSecretAgentConfigFile ]; + script = "${lib.getExe cfg.ensureProfiles.secrets.package} --conf ${nmFileSecretAgentConfigFile}"; + }; + }; +} From 6f63618bd6bacdcad5e9d3850c605e7acc46d6b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Dec 2024 16:48:32 +0000 Subject: [PATCH 039/146] python312Packages.amaranth: 0.5.3 -> 0.5.4 --- pkgs/development/python-modules/amaranth/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix index ebb79d5e9ba9e..c4effc2947878 100644 --- a/pkgs/development/python-modules/amaranth/default.nix +++ b/pkgs/development/python-modules/amaranth/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "amaranth"; format = "pyproject"; - version = "0.5.3"; + version = "0.5.4"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth"; - rev = "refs/tags/v${version}"; - hash = "sha256-lPQw7fAVM7URdyC/9c/UIYsRxVXrLjvHODvhYBdlkkg="; + tag = "v${version}"; + hash = "sha256-e4htbNq6OCy8ZTS1UnucbU987reukP4J1CbWhT39K6E="; }; postPatch = '' From 12ee821574df5596b49990e11eb8a22e5ea32a1d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Dec 2024 05:34:03 +0000 Subject: [PATCH 040/146] flexget: 3.12.1 -> 3.13.2 --- pkgs/by-name/fl/flexget/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix index 80ee7a88fb025..e16386bcf7a78 100644 --- a/pkgs/by-name/fl/flexget/package.nix +++ b/pkgs/by-name/fl/flexget/package.nix @@ -6,15 +6,15 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.12.1"; + version = "3.13.2"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "Flexget"; repo = "Flexget"; - rev = "refs/tags/v${version}"; - hash = "sha256-rW5ZFxpVoRTy257mo2LoX5Af12ZMyIGVzFCPwF5OF/c="; + tag = "v${version}"; + hash = "sha256-UjKYHZwAOOv3Adj13r2zJkVmxwEpJLQk87UslddX9Qk="; }; # relax dep constrains, keep environment constraints From 62c61b3721437f6cfd4254ebca734eb214d1961a Mon Sep 17 00:00:00 2001 From: Daniel Baker Date: Tue, 17 Dec 2024 22:00:10 -0800 Subject: [PATCH 041/146] oxide-rs: init at 0.9.0+20241204.0.0 Initializes the oxide-rs package at version 0.9.0+20241204.0.0. It provides the `oxide` and `xtask` binaries. --- ...-use-crates-io-over-git-dependencies.patch | 150 + pkgs/by-name/ox/oxide-rs/Cargo.lock | 4755 +++++++++++++++++ pkgs/by-name/ox/oxide-rs/package.nix | 81 + 3 files changed, 4986 insertions(+) create mode 100644 pkgs/by-name/ox/oxide-rs/0001-use-crates-io-over-git-dependencies.patch create mode 100644 pkgs/by-name/ox/oxide-rs/Cargo.lock create mode 100644 pkgs/by-name/ox/oxide-rs/package.nix diff --git a/pkgs/by-name/ox/oxide-rs/0001-use-crates-io-over-git-dependencies.patch b/pkgs/by-name/ox/oxide-rs/0001-use-crates-io-over-git-dependencies.patch new file mode 100644 index 0000000000000..816e8741fc8e7 --- /dev/null +++ b/pkgs/by-name/ox/oxide-rs/0001-use-crates-io-over-git-dependencies.patch @@ -0,0 +1,150 @@ +diff --git a/Cargo.lock b/Cargo.lock +index c0d18e4..45686a0 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1514,7 +1514,7 @@ dependencies = [ + "httpdate", + "itoa", + "pin-project-lite", +- "socket2 0.5.7", ++ "socket2 0.4.10", + "tokio", + "tower-service", + "tracing", +@@ -2240,7 +2240,7 @@ version = "5.0.0-rc.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "23d385da3c602d29036d2f70beed71c36604df7570be17fed4c5b839616785bf" + dependencies = [ +- "base64 0.22.1", ++ "base64 0.21.7", + "chrono", + "getrandom", + "http 1.1.0", +@@ -2354,7 +2354,7 @@ dependencies = [ + "clap", + "dirs", + "futures", +- "progenitor-client 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "progenitor-client", + "rand", + "regress", + "reqwest", +@@ -2684,9 +2684,10 @@ dependencies = [ + [[package]] + name = "progenitor" + version = "0.8.0" +-source = "git+https://github.com/oxidecomputer/progenitor#04da1197662209339ae8dd3768a0157c65ff5d67" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "293df5b79211fbf0c1ebad6513ba451d267e9c15f5f19ee5d3da775e2dd27331" + dependencies = [ +- "progenitor-client 0.8.0 (git+https://github.com/oxidecomputer/progenitor)", ++ "progenitor-client", + "progenitor-impl", + "progenitor-macro", + ] +@@ -2706,24 +2707,11 @@ dependencies = [ + "serde_urlencoded", + ] + +-[[package]] +-name = "progenitor-client" +-version = "0.8.0" +-source = "git+https://github.com/oxidecomputer/progenitor#04da1197662209339ae8dd3768a0157c65ff5d67" +-dependencies = [ +- "bytes", +- "futures-core", +- "percent-encoding", +- "reqwest", +- "serde", +- "serde_json", +- "serde_urlencoded", +-] +- + [[package]] + name = "progenitor-impl" + version = "0.8.0" +-source = "git+https://github.com/oxidecomputer/progenitor#04da1197662209339ae8dd3768a0157c65ff5d67" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d85934a440963a69f9f04f48507ff6e7aa2952a5b2d8f96cc37fa3dd5c270f66" + dependencies = [ + "heck", + "http 1.1.0", +@@ -2736,7 +2724,7 @@ dependencies = [ + "serde", + "serde_json", + "syn", +- "thiserror 2.0.6", ++ "thiserror 1.0.69", + "typify", + "unicode-ident", + ] +@@ -2744,7 +2732,8 @@ dependencies = [ + [[package]] + name = "progenitor-macro" + version = "0.8.0" +-source = "git+https://github.com/oxidecomputer/progenitor#04da1197662209339ae8dd3768a0157c65ff5d67" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d99a5a259e2d65a4933054aa51717c70b6aba0522695731ac354a522124efc9b" + dependencies = [ + "openapiv3", + "proc-macro2", +@@ -4069,7 +4058,8 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + [[package]] + name = "typify" + version = "0.2.0" +-source = "git+https://github.com/oxidecomputer/typify#f3e0cc9d6a5cee617a636136b99db650817bcbde" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b4c644dda9862f0fef3a570d8ddb3c2cfb1d5ac824a1f2ddfa7bc8f071a5ad8a" + dependencies = [ + "typify-impl", + "typify-macro", +@@ -4078,7 +4068,8 @@ dependencies = [ + [[package]] + name = "typify-impl" + version = "0.2.0" +-source = "git+https://github.com/oxidecomputer/typify#f3e0cc9d6a5cee617a636136b99db650817bcbde" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d59ab345b6c0d8ae9500b9ff334a4c7c0d316c1c628dc55726b95887eb8dbd11" + dependencies = [ + "heck", + "log", +@@ -4090,14 +4081,15 @@ dependencies = [ + "serde", + "serde_json", + "syn", +- "thiserror 2.0.6", ++ "thiserror 1.0.69", + "unicode-ident", + ] + + [[package]] + name = "typify-macro" + version = "0.2.0" +-source = "git+https://github.com/oxidecomputer/typify#f3e0cc9d6a5cee617a636136b99db650817bcbde" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "785e2cdcef0df8160fdd762ed548a637aaec1e83704fdbc14da0df66013ee8d0" + dependencies = [ + "proc-macro2", + "quote", +@@ -4413,7 +4405,7 @@ version = "0.1.9" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" + dependencies = [ +- "windows-sys 0.59.0", ++ "windows-sys 0.48.0", + ] + + [[package]] +diff --git a/Cargo.toml b/Cargo.toml +index 8ef28ff..15739d7 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -40,7 +40,7 @@ oxide-httpmock = { path = "sdk-httpmock", version = "0.9.0" } + oxnet = { git = "https://github.com/oxidecomputer/oxnet" } + predicates = "3.1.2" + pretty_assertions = "1.4.1" +-progenitor = { git = "https://github.com/oxidecomputer/progenitor" } ++progenitor = "0.8.0" + progenitor-client = "0.8.0" + rand = "0.8.5" + ratatui = "0.26.3" diff --git a/pkgs/by-name/ox/oxide-rs/Cargo.lock b/pkgs/by-name/ox/oxide-rs/Cargo.lock new file mode 100644 index 0000000000000..45686a08d5e02 --- /dev/null +++ b/pkgs/by-name/ox/oxide-rs/Cargo.lock @@ -0,0 +1,4755 @@ +# 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.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" + +[[package]] +name = "ascii-canvas" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" +dependencies = [ + "term", +] + +[[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_cmd" +version = "2.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc1835b7f27878de8525dc71410b5a31cdcc5f230aed5ba5df968e09c201b23d" +dependencies = [ + "anstyle", + "bstr", + "doc-comment", + "libc", + "predicates", + "predicates-core", + "predicates-tree", + "wait-timeout", +] + +[[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.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand 2.1.1", + "futures-lite 2.3.0", + "slab", +] + +[[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.4", + "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", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2 0.4.10", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" +dependencies = [ + "async-lock 3.4.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.7.3", + "rustix 0.38.40", + "slab", + "tracing", + "windows-sys 0.59.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-object-pool" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aeb901c30ebc2fc4ab46395bbfbdba9542c16559d853645d75190c3056caf3bc" +dependencies = [ + "async-std", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.40", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-signal" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" +dependencies = [ + "async-io 2.3.4", + "async-lock 3.4.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.40", + "signal-hook-registry", + "slab", + "windows-sys 0.59.0", +] + +[[package]] +name = "async-std" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +dependencies = [ + "async-channel 1.9.0", + "async-global-executor", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process", + "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-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 = "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", + "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.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 = "basic-cookies" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67bd8fd42c16bdb08688243dc5f0cc117a3ca9efeeaba3a345a18a6159ad96f7" +dependencies = [ + "lalrpop", + "lalrpop-util", + "regex", +] + +[[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 = "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 = "bstr" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +dependencies = [ + "memchr", + "regex-automata", + "serde", +] + +[[package]] +name = "built" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c360505aed52b7ec96a3636c3f039d99103c37d1d9b4f7a8c743d3ea9ffcd03b" +dependencies = [ + "git2", +] + +[[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.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" + +[[package]] +name = "camino" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" +dependencies = [ + "serde", +] + +[[package]] +name = "cassowary" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" + +[[package]] +name = "castaway" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" + +[[package]] +name = "castaway" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5" +dependencies = [ + "rustversion", +] + +[[package]] +name = "cc" +version = "1.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +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.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", + "terminal_size", +] + +[[package]] +name = "clap_complete" +version = "4.5.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9647a559c112175f17cf724dc72d3645680a883c58481332779192b0d8e7a01" +dependencies = [ + "clap", +] + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" + +[[package]] +name = "colorchoice" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" + +[[package]] +name = "colored" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" +dependencies = [ + "lazy_static", + "windows-sys 0.48.0", +] + +[[package]] +name = "compact_str" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" +dependencies = [ + "castaway 0.2.3", + "cfg-if", + "itoa", + "ryu", + "static_assertions", +] + +[[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" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width 0.1.13", + "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 = "cpufeatures" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +dependencies = [ + "libc", +] + +[[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.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" +dependencies = [ + "bitflags 2.6.0", + "crossterm_winapi", + "futures-core", + "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 = "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 = "curl" +version = "0.4.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6" +dependencies = [ + "curl-sys", + "libc", + "openssl-probe", + "openssl-sys", + "schannel", + "socket2 0.5.7", + "windows-sys 0.52.0", +] + +[[package]] +name = "curl-sys" +version = "0.4.74+curl-8.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8af10b986114528fcdc4b63b6f5f021b7057618411046a4de2ba0f0149a097bf" +dependencies = [ + "cc", + "libc", + "libnghttp2-sys", + "libz-sys", + "openssl-sys", + "pkg-config", + "vcpkg", + "windows-sys 0.52.0", +] + +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "debug-ignore" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe7ed1d93f4553003e20b629abe9085e1e81b1429520f897f8f8860bc6dfc21" + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "dialoguer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" +dependencies = [ + "console", + "shell-words", + "tempfile", + "zeroize", +] + +[[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.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[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-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" +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-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", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "dropshot" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50976b6bac0894e689bb8ce0e2e5892dfeedb0876408bc806f0582d81824a3b5" +dependencies = [ + "async-stream", + "async-trait", + "base64 0.22.1", + "bytes", + "camino", + "chrono", + "debug-ignore", + "dropshot_endpoint", + "form_urlencoded", + "futures", + "hostname 0.4.0", + "http 1.1.0", + "http-body-util", + "hyper 1.5.0", + "hyper-util", + "indexmap", + "multer", + "openapiv3", + "paste", + "percent-encoding", + "rustls 0.22.4", + "rustls-pemfile", + "schemars", + "scopeguard", + "semver", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sha1", + "slog", + "slog-async", + "slog-bunyan", + "slog-json", + "slog-term", + "thiserror 1.0.69", + "tokio", + "tokio-rustls 0.25.0", + "toml", + "uuid", + "version_check", + "waitgroup", +] + +[[package]] +name = "dropshot_endpoint" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8371ca3d0ecdd13df8a00acb66312633fc66a5e412076ccbc414238536f8290" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "semver", + "serde", + "serde_tokenstream", + "syn", +] + +[[package]] +name = "dyn-clone" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "ena" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5" +dependencies = [ + "log", +] + +[[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.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +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 = "event-listener" +version = "2.5.3" +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" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[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 = "expectorate" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de6f19b25bdfa2747ae775f37cd109c31f1272d4e4c83095be0727840aa1d75f" +dependencies = [ + "console", + "newline-converter", + "predicates", + "similar", +] + +[[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 = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[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 = "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-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.1.1", + "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 = "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.29.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 2.6.0", + "libc", + "libgit2-sys", + "log", + "url", +] + +[[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 = "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", + "tracing", +] + +[[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 = "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 = "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" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" +dependencies = [ + "cfg-if", + "libc", + "windows", +] + +[[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 = "httpmock" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b02e044d3b4c2f94936fb05f9649efa658ca788f44eb6b87554e2033fc8ce93" +dependencies = [ + "assert-json-diff", + "async-object-pool", + "async-trait", + "base64 0.21.7", + "basic-cookies", + "crossbeam-utils", + "form_urlencoded", + "futures-util", + "hyper 0.14.30", + "isahc", + "lazy_static", + "levenshtein", + "log", + "regex", + "serde", + "serde_json", + "serde_regex", + "similar", + "tokio", + "url", +] + +[[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", + "http 0.2.12", + "http-body 0.4.6", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.4.10", + "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", + "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.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.12", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.0", + "tower-service", + "webpki-roots", +] + +[[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.5.0", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + +[[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 0.5.7", + "tokio", + "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 = "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.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" +dependencies = [ + "equivalent", + "hashbrown 0.15.0", + "serde", +] + +[[package]] +name = "indicatif" +version = "0.17.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf675b85ed934d3c67b5c5469701eec7db22689d0a2139d856e0925fa28b281" +dependencies = [ + "console", + "number_prefix", + "portable-atomic", + "unicode-width 0.2.0", + "web-time", +] + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "integration-tests" +version = "0.0.0" +dependencies = [ + "httpmock", + "oxide", + "oxide-httpmock", + "rand", + "tempfile", + "test-common", + "tokio", + "uuid", +] + +[[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 = "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-docker" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" +dependencies = [ + "once_cell", +] + +[[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-wsl" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "isahc" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9" +dependencies = [ + "async-channel 1.9.0", + "castaway 0.1.2", + "crossbeam-utils", + "curl", + "curl-sys", + "encoding_rs", + "event-listener 2.5.3", + "futures-lite 1.13.0", + "http 0.2.12", + "log", + "mime", + "once_cell", + "polling 2.8.0", + "slab", + "sluice", + "tracing", + "tracing-futures", + "url", + "waker-fn", +] + +[[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 = "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 = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +dependencies = [ + "log", +] + +[[package]] +name = "lalrpop" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca" +dependencies = [ + "ascii-canvas", + "bit-set", + "ena", + "itertools 0.11.0", + "lalrpop-util", + "petgraph", + "pico-args", + "regex", + "regex-syntax", + "string_cache", + "term", + "tiny-keccak", + "unicode-xid", + "walkdir", +] + +[[package]] +name = "lalrpop-util" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" +dependencies = [ + "regex-automata", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "levenshtein" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" + +[[package]] +name = "libc" +version = "0.2.168" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" + +[[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 = "libnghttp2-sys" +version = "0.1.10+1.61.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "959c25552127d2e1fa72f0e52548ec04fc386e827ba71a7bd01db46a447dc135" +dependencies = [ + "cc", + "libc", +] + +[[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.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 = "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" +dependencies = [ + "value-bag", +] + +[[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 = "match_cfg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + +[[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 = "mime" +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 = "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 = "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 = "multer" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83e87776546dc87511aa5ee218730c92b666d7264ab6ed41f9d215af9cd5224b" +dependencies = [ + "bytes", + "encoding_rs", + "futures-util", + "http 1.1.0", + "httparse", + "memchr", + "mime", + "spin 0.9.8", + "version_check", +] + +[[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 = "newline-converter" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47b6b097ecb1cbfed438542d16e84fd7ad9b0c76c8a65b7f9039212a3d14dc7f" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "normalize-line-endings" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" + +[[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_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "oauth2" +version = "5.0.0-rc.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d385da3c602d29036d2f70beed71c36604df7570be17fed4c5b839616785bf" +dependencies = [ + "base64 0.21.7", + "chrono", + "getrandom", + "http 1.1.0", + "rand", + "reqwest", + "serde", + "serde_json", + "serde_path_to_error", + "sha2", + "thiserror 1.0.69", + "url", +] + +[[package]] +name = "object" +version = "0.36.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "open" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a083c0c7e5e4a8ec4176346cf61f67ac674e8bfb059d9226e1c54a96b377c12" +dependencies = [ + "is-wsl", + "libc", + "pathdiff", +] + +[[package]] +name = "openapiv3" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc02deea53ffe807708244e5914f6b099ad7015a207ee24317c22112e17d9c5c" +dependencies = [ + "indexmap", + "serde", + "serde_json", +] + +[[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 = "oxide" +version = "0.9.0+20241204.0.0" +dependencies = [ + "base64 0.22.1", + "chrono", + "clap", + "dirs", + "futures", + "progenitor-client", + "rand", + "regress", + "reqwest", + "schemars", + "serde", + "serde_json", + "tempfile", + "test-common", + "thiserror 2.0.6", + "tokio", + "toml", + "toml_edit", + "uuid", +] + +[[package]] +name = "oxide-cli" +version = "0.9.0+20241204.0.0" +dependencies = [ + "anyhow", + "assert_cmd", + "async-trait", + "base64 0.22.1", + "built", + "chrono", + "clap", + "clap_complete", + "colored", + "crossterm", + "dialoguer", + "dirs", + "dropshot", + "env_logger", + "expectorate", + "futures", + "httpmock", + "humantime", + "indicatif", + "libc", + "log", + "md5", + "oauth2", + "open", + "oxide", + "oxide-httpmock", + "oxnet", + "predicates", + "pretty_assertions", + "rand", + "ratatui", + "rcgen", + "reqwest", + "schemars", + "serde", + "serde_json", + "tabwriter", + "tempfile", + "test-common", + "thouart", + "tokio", + "toml", + "toml_edit", + "url", + "uuid", +] + +[[package]] +name = "oxide-httpmock" +version = "0.9.0+20241204.0.0" +dependencies = [ + "chrono", + "httpmock", + "oxide", + "regex", + "serde_json", + "uuid", +] + +[[package]] +name = "oxnet" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/oxnet#7dacd265f1bcd0f8b47bd4805250c4f0812da206" +dependencies = [ + "ipnetwork", + "schemars", + "serde", + "serde_json", +] + +[[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 = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "pem" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +dependencies = [ + "base64 0.13.1", +] + +[[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_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[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.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 = "piper" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" +dependencies = [ + "atomic-waker", + "fastrand 2.1.1", + "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", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[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 0.38.40", + "tracing", + "windows-sys 0.59.0", +] + +[[package]] +name = "portable-atomic" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" + +[[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 = "predicates" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" +dependencies = [ + "anstyle", + "difflib", + "float-cmp", + "normalize-line-endings", + "predicates-core", + "regex", +] + +[[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-macro2" +version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "progenitor" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "293df5b79211fbf0c1ebad6513ba451d267e9c15f5f19ee5d3da775e2dd27331" +dependencies = [ + "progenitor-client", + "progenitor-impl", + "progenitor-macro", +] + +[[package]] +name = "progenitor-client" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a5db54eac3cae7007a0785854bc3e89fd418cca7dfc2207b99b43979154c1b" +dependencies = [ + "bytes", + "futures-core", + "percent-encoding", + "reqwest", + "serde", + "serde_json", + "serde_urlencoded", +] + +[[package]] +name = "progenitor-impl" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d85934a440963a69f9f04f48507ff6e7aa2952a5b2d8f96cc37fa3dd5c270f66" +dependencies = [ + "heck", + "http 1.1.0", + "indexmap", + "openapiv3", + "proc-macro2", + "quote", + "regex", + "schemars", + "serde", + "serde_json", + "syn", + "thiserror 1.0.69", + "typify", + "unicode-ident", +] + +[[package]] +name = "progenitor-macro" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d99a5a259e2d65a4933054aa51717c70b6aba0522695731ac354a522124efc9b" +dependencies = [ + "openapiv3", + "proc-macro2", + "progenitor-impl", + "quote", + "schemars", + "serde", + "serde_json", + "serde_tokenstream", + "serde_yaml", + "syn", +] + +[[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.12", + "socket2 0.5.7", + "thiserror 1.0.69", + "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", + "rustls 0.23.12", + "slab", + "thiserror 1.0.69", + "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 = "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 = "ratatui" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f44c9e68fd46eda15c646fbb85e1040b657a58cdc8c98db1d97a55930d991eef" +dependencies = [ + "bitflags 2.6.0", + "cassowary", + "compact_str", + "crossterm", + "itertools 0.12.1", + "lru", + "paste", + "stability", + "strum", + "unicode-segmentation", + "unicode-truncate", + "unicode-width 0.1.13", +] + +[[package]] +name = "rcgen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" +dependencies = [ + "pem", + "ring 0.16.20", + "time", + "yasna", +] + +[[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 1.0.69", +] + +[[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 = "regress" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1541daf4e4ed43a0922b7969bdc2170178bcacc5dabf7e39bc508a9fa3953a7a" +dependencies = [ + "hashbrown 0.14.5", + "memchr", +] + +[[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", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.5.0", + "hyper-rustls", + "hyper-tls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls 0.23.12", + "rustls-pemfile", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-rustls 0.26.0", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "webpki-roots", + "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", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.52.0", +] + +[[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 = "rustfmt-wrapper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1adc9dfed5cc999077978cc7163b9282c5751c8d39827c4ea8c8c220ca5a440" +dependencies = [ + "serde", + "tempfile", + "thiserror 1.0.69", + "toml", + "toolchain_find", +] + +[[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.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99e4ea3e1cdc4b559b8e5650f9c8e5998e3e5c1343b4eaf034565f32318d63c0" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys 0.4.14", + "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 0.17.8", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls" +version = "0.23.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +dependencies = [ + "once_cell", + "ring 0.17.8", + "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.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 0.17.8", + "rustls-pki-types", + "untrusted 0.9.0", +] + +[[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 = "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.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "schemars" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" +dependencies = [ + "chrono", + "dyn-clone", + "schemars_derive", + "serde", + "serde_json", + "uuid", +] + +[[package]] +name = "schemars_derive" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn", +] + +[[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 = "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.215" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.215" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_derive_internals" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.133" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +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_regex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf" +dependencies = [ + "regex", + "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_tokenstream" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64060d864397305347a78851c51588fd283767e7e7589829e8121d65512340f1" +dependencies = [ + "proc-macro2", + "quote", + "serde", + "syn", +] + +[[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.34+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" +dependencies = [ + "indexmap", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[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 = "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 = "similar" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" + +[[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 = "slog" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8347046d4ebd943127157b94d63abb990fcf729dc4e9978927fdf4ac3c998d06" + +[[package]] +name = "slog-async" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72c8038f898a2c79507940990f05386455b3a317d8f18d4caea7cbc3d5096b84" +dependencies = [ + "crossbeam-channel", + "slog", + "take_mut", + "thread_local", +] + +[[package]] +name = "slog-bunyan" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcaaf6e68789d3f0411f1e72bc443214ef252a1038b6e344836e50442541f190" +dependencies = [ + "hostname 0.3.1", + "slog", + "slog-json", + "time", +] + +[[package]] +name = "slog-json" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e1e53f61af1e3c8b852eef0a9dee29008f55d6dd63794f3f12cef786cf0f219" +dependencies = [ + "serde", + "serde_json", + "slog", + "time", +] + +[[package]] +name = "slog-term" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6e022d0b998abfe5c3782c1f03551a596269450ccd677ea51c56f8b214610e8" +dependencies = [ + "is-terminal", + "slog", + "term", + "thread_local", + "time", +] + +[[package]] +name = "sluice" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" +dependencies = [ + "async-channel 1.9.0", + "futures-core", + "futures-io", +] + +[[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.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 = "stability" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d904e7009df136af5297832a3ace3370cd14ff1546a232f4f185036c2736fcac" +dependencies = [ + "quote", + "syn", +] + +[[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 = "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", + "precomputed-hash", +] + +[[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.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" +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 = "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-configuration" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "tabwriter" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a327282c4f64f6dc37e3bba4c2b6842cc3a992f204fa58d917696a89f691e5f6" +dependencies = [ + "unicode-width 0.1.13", +] + +[[package]] +name = "take_mut" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" + +[[package]] +name = "tempfile" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" +dependencies = [ + "cfg-if", + "fastrand 2.1.1", + "once_cell", + "rustix 0.38.40", + "windows-sys 0.59.0", +] + +[[package]] +name = "term" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +dependencies = [ + "dirs-next", + "rustversion", + "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 = "terminal_size" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef" +dependencies = [ + "rustix 0.38.40", + "windows-sys 0.59.0", +] + +[[package]] +name = "termini" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ad441d87dd98bc5eeb31cf2fb7e4839968763006b478efb38668a3bf9da0d59" +dependencies = [ + "home", +] + +[[package]] +name = "termtree" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" + +[[package]] +name = "test-common" +version = "0.0.0" +dependencies = [ + "chrono", + "rand", + "schemars", + "serde", + "serde_json", + "uuid", +] + +[[package]] +name = "thiserror" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47" +dependencies = [ + "thiserror-impl 2.0.6", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thouart" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/thouart#1f22ae2457a2023b1e21613cf1228c7c3e80c37f" +dependencies = [ + "futures", + "libc", + "regex", + "term", + "termini", + "thiserror 1.0.69", + "tokio", + "tokio-tungstenite", + "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", + "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 = "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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" +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", +] + +[[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 0.22.4", + "rustls-pki-types", + "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.12", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite", +] + +[[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.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 = "toolchain_find" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc8c9a7f0a2966e1acdaf0461023d0b01471eeead645370cf4c3f5cff153f2a" +dependencies = [ + "home", + "once_cell", + "regex", + "semver", + "walkdir", +] + +[[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", +] + +[[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 = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "tungstenite" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 0.2.12", + "httparse", + "log", + "rand", + "sha1", + "thiserror 1.0.69", + "url", + "utf-8", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "typify" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c644dda9862f0fef3a570d8ddb3c2cfb1d5ac824a1f2ddfa7bc8f071a5ad8a" +dependencies = [ + "typify-impl", + "typify-macro", +] + +[[package]] +name = "typify-impl" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59ab345b6c0d8ae9500b9ff334a4c7c0d316c1c628dc55726b95887eb8dbd11" +dependencies = [ + "heck", + "log", + "proc-macro2", + "quote", + "regress", + "schemars", + "semver", + "serde", + "serde_json", + "syn", + "thiserror 1.0.69", + "unicode-ident", +] + +[[package]] +name = "typify-macro" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "785e2cdcef0df8160fdd762ed548a637aaec1e83704fdbc14da0df66013ee8d0" +dependencies = [ + "proc-macro2", + "quote", + "schemars", + "semver", + "serde", + "serde_json", + "serde_tokenstream", + "syn", + "typify-impl", +] + +[[package]] +name = "unicode-ident" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[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 0.1.13", +] + +[[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "unicode-width" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" + +[[package]] +name = "unicode-xid" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" +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 = "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 = "uuid" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "value-bag" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" + +[[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 = "wait-timeout" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +dependencies = [ + "libc", +] + +[[package]] +name = "waitgroup" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1f50000a783467e6c0200f9d10642f4bc424e39efc1b770203e88b488f79292" +dependencies = [ + "atomic-waker", +] + +[[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.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-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", + "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 = "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.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +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 = "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.48.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-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.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +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 = "xtask" +version = "0.0.0" +dependencies = [ + "clap", + "newline-converter", + "progenitor", + "regex", + "rustfmt-wrapper", + "serde_json", + "similar", +] + +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" + +[[package]] +name = "yasna" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" +dependencies = [ + "time", +] + +[[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 = "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 = "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", +] diff --git a/pkgs/by-name/ox/oxide-rs/package.nix b/pkgs/by-name/ox/oxide-rs/package.nix new file mode 100644 index 0000000000000..0ceb63fab6219 --- /dev/null +++ b/pkgs/by-name/ox/oxide-rs/package.nix @@ -0,0 +1,81 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + curl, + pkg-config, + libgit2, + openssl, + zlib, + stdenv, + darwin, +}: + +rustPlatform.buildRustPackage rec { + pname = "oxide-rs"; + version = "0.9.0+20241204.0.0"; + + src = fetchFromGitHub { + owner = "oxidecomputer"; + repo = "oxide.rs"; + rev = "v${version}"; + hash = "sha256-NtTXpXDYazcXilQNW455UDkqMCFzFPvTUkbEBQsWIDo="; + # leaveDotGit is necessary because `build.rs` expects git information which + # is used to write a `built.rs` file which is read by the CLI application + # to display version information. + leaveDotGit = true; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "oxnet-0.1.0" = "sha256-RFTNKLR4JrNs09De8K+M35RDk/7Nojyl0B9d14O9tfM="; + "thouart-0.1.0" = "sha256-GqSHyhDCqQCC8dCvXzsn2WMcNKJxJWXrTcR38Wr3T1s="; + }; + }; + + cargoPatches = [ + ./0001-use-crates-io-over-git-dependencies.patch + ]; + + cargoBuildFlags = [ + "--package=oxide-cli" + "--package=xtask" + ]; + + cargoTestFlags = [ + "--package=oxide-cli" + ]; + + nativeBuildInputs = [ + curl + pkg-config + ]; + + buildInputs = + [ + curl + libgit2 + openssl + zlib + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + env = { + OPENSSL_NO_VENDOR = true; + }; + + meta = { + description = "The Oxide Rust SDK and CLI"; + homepage = "https://github.com/oxidecomputer/oxide.rs"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ + djacu + sarcasticadmin + ]; + mainProgram = "oxide"; + }; +} From ae0d3c6c0490a20944934eda342bf4279a2586b6 Mon Sep 17 00:00:00 2001 From: Konrad Malik Date: Wed, 18 Dec 2024 14:00:09 +0100 Subject: [PATCH 042/146] odafileconverter: 21.11.0.0 -> 25.11.0.0 --- .../graphics/odafileconverter/default.nix | 38 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/graphics/odafileconverter/default.nix b/pkgs/applications/graphics/odafileconverter/default.nix index 047c2e9dd56a5..9f9b104c16557 100644 --- a/pkgs/applications/graphics/odafileconverter/default.nix +++ b/pkgs/applications/graphics/odafileconverter/default.nix @@ -1,36 +1,43 @@ { lib, stdenv, - mkDerivation, dpkg, fetchurl, - qtbase, + qt6, + libGL, }: let - # To obtain the version you will need to run the following command: - # - # dpkg-deb -I ${odafileconverter.src} | grep Version - version = "21.11.0.0"; rpath = "$ORIGIN:${ lib.makeLibraryPath [ stdenv.cc.cc - qtbase + qt6.qtbase + libGL ] }"; in -mkDerivation { +stdenv.mkDerivation rec { pname = "oda-file-converter"; - inherit version; - nativeBuildInputs = [ dpkg ]; + # To obtain the version you will need to run the following command: + # + # dpkg-deb -I ${odafileconverter.src} | grep Version + version = "25.11.0.0"; src = fetchurl { # NB: this URL is not stable (i.e. the underlying file and the corresponding version will change over time) - url = "https://web.archive.org/web/20201206221727if_/https://download.opendesign.com/guestfiles/Demo/ODAFileConverter_QT5_lnxX64_7.2dll_21.11.deb"; - sha256 = "10027a3ab18efd04ca75aa699ff550eca3bdfe6f7084460d3c00001bffb50070"; + url = "https://web.archive.org/web/20241212154957/https://www.opendesign.com/guestfiles/get?filename=ODAFileConverter_QT6_lnxX64_8.3dll_25.11.deb"; + hash = "sha256-lykCOT9gmXZ3vGmak8mvrIMBEmGMJ/plmE3vkk9EjYo="; }; + buildInputs = [ + qt6.qtbase + ]; + nativeBuildInputs = [ + dpkg + qt6.wrapQtAppsHook + ]; + installPhase = '' mkdir -p $out/bin $out/lib cp -vr usr/bin/ODAFileConverter_${version} $out/libexec @@ -45,7 +52,7 @@ mkDerivation { wrapQtApp $out/libexec/ODAFileConverter mv $out/libexec/ODAFileConverter $out/bin - find $out/libexec -type f -executable | while read file; do + find $out/libexec -not -path "*/doc/*" -not -path "*/translations/*" -type f -executable | while read file; do echo "patching $file" patchelf --set-rpath '${rpath}' $file done @@ -56,7 +63,10 @@ mkDerivation { homepage = "https://www.opendesign.com/guestfiles/oda_file_converter"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ nagisa ]; + maintainers = with maintainers; [ + nagisa + konradmalik + ]; platforms = [ "x86_64-linux" ]; mainProgram = "ODAFileConverter"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 236caece38745..c58ca66db9662 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2607,7 +2607,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Security; }; - odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter { }; + odafileconverter = callPackage ../applications/graphics/odafileconverter { }; pastel = callPackage ../applications/misc/pastel { inherit (darwin.apple_sdk.frameworks) Security; From da413772e0aeadc528dc820ab30c47c280825412 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Dec 2024 13:50:11 +0000 Subject: [PATCH 043/146] pagefind: 1.2.0 -> 1.3.0 --- pkgs/applications/misc/pagefind/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/applications/misc/pagefind/default.nix index 9bdeb864ca95a..611c9b002ed7b 100644 --- a/pkgs/applications/misc/pagefind/default.nix +++ b/pkgs/applications/misc/pagefind/default.nix @@ -38,16 +38,16 @@ in rustPlatform.buildRustPackage rec { pname = "pagefind"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "cloudcannon"; repo = "pagefind"; rev = "refs/tags/v${version}"; - hash = "sha256-OKZYy+Mm9xOEBBD/tI2GwP2+Myt5aELosRP8Tbi5bqY="; + hash = "sha256-NIEiXwuy8zuUDxPsD4Hiq3x4cOG3VM+slfNIBSJU2Mk="; }; - cargoHash = "sha256-k50RyGuS66r+wWIij7yOOSlDxXYY1y+lTJgCkMREllc="; + cargoHash = "sha256-dfE4pfArW9hTPi7LCC9l274dNd1r0RAh50cciUGnv58="; env.npmDeps_web_js = fetchNpmDeps { name = "npm-deps-web-js"; From a1b39dc769985a01868dd31ff4892eee449a0e15 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com> Date: Wed, 18 Dec 2024 16:41:48 +0300 Subject: [PATCH 044/146] dwarfs: 0.9.10 -> 0.10.2 --- pkgs/by-name/dw/dwarfs/package.nix | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/dw/dwarfs/package.nix b/pkgs/by-name/dw/dwarfs/package.nix index 91174d41d7ade..934a54a5cd9bf 100644 --- a/pkgs/by-name/dw/dwarfs/package.nix +++ b/pkgs/by-name/dw/dwarfs/package.nix @@ -25,16 +25,21 @@ xxHash, utf8cpp, zstd, + parallel-hashmap, + nlohmann_json, + libdwarf, }: + stdenv.mkDerivation (finalAttrs: { pname = "dwarfs"; - version = "0.9.10"; + version = "0.10.2"; + src = fetchFromGitHub { owner = "mhx"; repo = "dwarfs"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-uyYNs+fDV5BfQwfX9Wi3BwiKjSDQHAKRJ1+UvS/fHoE="; + hash = "sha256-wQ+6jSf/RWAI7cSRMb1zG09kOiyMM5xiy8yS6tl1ybI="; }; cmakeFlags = [ @@ -43,18 +48,7 @@ stdenv.mkDerivation (finalAttrs: { # Needs to be set so `dwarfs` does not try to download `gtest`; it is not # a submodule, see: https://github.com/mhx/dwarfs/issues/188#issuecomment-1907657083 "-DPREFER_SYSTEM_GTEST=ON" - - # These should no longer be necessary with a version > 0.9.10: - # * https://github.com/mhx/dwarfs/commit/593b22a8a90eb66c0898ae06f097f32f4bf3dfd4 - # * https://github.com/mhx/dwarfs/commit/6e9608b2b01be13e41e6b728aae537c14c00ad82 - # * https://github.com/mhx/dwarfs/commit/ce4bee1ad63c666da57d2cdae9fd65214d8dab7f - "-DPREFER_SYSTEM_LIBFMT=ON" - "-DPREFER_SYSTEM_ZSTD=ON" - "-DPREFER_SYSTEM_XXHASH=ON" - - # may be added under an option in the future - # "-DWITH_LEGACY_FUSE=ON" - + "-DWITH_LEGACY_FUSE=ON" "-DWITH_TESTS=ON" ]; @@ -70,6 +64,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ # dwarfs + parallel-hashmap + nlohmann_json boost flac # optional; allows automatic audio compression fmt @@ -87,6 +83,7 @@ stdenv.mkDerivation (finalAttrs: { libevent libunwind openssl + libdwarf # DWARFS_STACKTRACE_ENABLED relies on FOLLY_USE_SYMBOLIZER, which needs FOLLY_HAVE_DWARF ]; doCheck = true; From bb934f49060a26c3ceca65325051f82b360929bc Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com> Date: Wed, 18 Dec 2024 16:49:02 +0300 Subject: [PATCH 045/146] dwarfs: use versionCheckHook --- pkgs/by-name/dw/dwarfs/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/dw/dwarfs/package.nix b/pkgs/by-name/dw/dwarfs/package.nix index 934a54a5cd9bf..a28e1823d1299 100644 --- a/pkgs/by-name/dw/dwarfs/package.nix +++ b/pkgs/by-name/dw/dwarfs/package.nix @@ -28,6 +28,7 @@ parallel-hashmap, nlohmann_json, libdwarf, + versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { @@ -107,6 +108,11 @@ stdenv.mkDerivation (finalAttrs: { in "-${lib.concatStringsSep ":" disabledTests}"; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = [ "--version" ]; + versionCheckProgram = "${placeholder "out"}/bin/dwarfs"; + meta = { description = "Fast high compression read-only file system"; homepage = "https://github.com/mhx/dwarfs"; From 0f62cb07925c7ec57f0e014e2dd8717183dce696 Mon Sep 17 00:00:00 2001 From: Konrad Malik Date: Wed, 18 Dec 2024 17:27:02 +0100 Subject: [PATCH 046/146] odafileconverter: move to by-name --- .../default.nix => by-name/od/odafileconverter/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/graphics/odafileconverter/default.nix => by-name/od/odafileconverter/package.nix} (100%) diff --git a/pkgs/applications/graphics/odafileconverter/default.nix b/pkgs/by-name/od/odafileconverter/package.nix similarity index 100% rename from pkgs/applications/graphics/odafileconverter/default.nix rename to pkgs/by-name/od/odafileconverter/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c58ca66db9662..9406a4010a795 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2607,8 +2607,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Security; }; - odafileconverter = callPackage ../applications/graphics/odafileconverter { }; - pastel = callPackage ../applications/misc/pastel { inherit (darwin.apple_sdk.frameworks) Security; }; From c664495348839bebda65f58dd28852a1cc5ebece Mon Sep 17 00:00:00 2001 From: Daniel Kilimnik Date: Wed, 18 Dec 2024 12:40:04 +0100 Subject: [PATCH 047/146] matrix-hookshot: 5.4.1 -> 6.0.1 --- pkgs/by-name/ma/matrix-hookshot/package.json | 76 +++++++++++--------- pkgs/by-name/ma/matrix-hookshot/package.nix | 5 +- pkgs/by-name/ma/matrix-hookshot/pin.json | 8 +-- 3 files changed, 48 insertions(+), 41 deletions(-) diff --git a/pkgs/by-name/ma/matrix-hookshot/package.json b/pkgs/by-name/ma/matrix-hookshot/package.json index 80739890d253c..c45b6a97ad669 100644 --- a/pkgs/by-name/ma/matrix-hookshot/package.json +++ b/pkgs/by-name/ma/matrix-hookshot/package.json @@ -1,6 +1,6 @@ { "name": "matrix-hookshot", - "version": "5.4.1", + "version": "6.0.1", "description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.", "main": "lib/app.js", "repository": "https://github.com/matrix-org/matrix-hookshot", @@ -10,7 +10,7 @@ "name": "matrix-hookshot-rs" }, "engines": { - "node": ">=20" + "node": ">=22" }, "scripts": { "build:web": "vite build", @@ -31,11 +31,11 @@ "start:webhooks": "node --require source-map-support/register lib/App/GithubWebhookApp.js", "start:matrixsender": "node --require source-map-support/register lib/App/MatrixSenderApp.js", "start:resetcrypto": "node --require source-map-support/register lib/App/ResetCryptoStore.js", - "test": "mocha -r ts-node/register tests/init.ts tests/*.ts tests/**/*.ts", - "test:e2e": "yarn node --experimental-vm-modules $(yarn bin jest)", + "test": "mocha -r ts-node/register tests/init.ts 'tests/*.ts' 'tests/**/*.ts'", + "test:e2e": "tsc --p tsconfig.spec.json && cp ./lib/libRs.js ./lib/matrix-hookshot-rs.node ./spec-lib/src && yarn node --experimental-vm-modules $(yarn bin jest)", "test:cover": "nyc --reporter=lcov --reporter=text yarn test", "lint": "yarn run lint:js && yarn run lint:rs", - "lint:js": "eslint -c .eslintrc.js 'src/**/*.ts' 'tests/**/*.ts' 'web/**/*.ts' 'web/**/*.tsx'", + "lint:js": "eslint", "lint:rs": "cargo fmt --all -- --check && cargo clippy -- -Dwarnings", "lint:rs:apply": "cargo clippy --fix && cargo fmt --all", "generate-default-config": "ts-node src/config/Defaults.ts --config > config.sample.yml", @@ -48,12 +48,14 @@ "@octokit/rest": "^20.0.2", "@octokit/webhooks": "^12.0.10", "@sentry/node": "^7.52.1", - "@vector-im/compound-design-tokens": "^1.3.0", - "@vector-im/compound-web": "^4.8.0", + "@vector-im/compound-design-tokens": "^2.0.1", + "@vector-im/compound-web": "^7.3.0", "ajv": "^8.11.0", - "axios": "^1.6.3", + "axios": "^1.7.5", + "clsx": "^2.1.1", "cors": "^2.8.5", - "express": "^4.18.2", + "date-fns": "^4.1.0", + "express": "^4.20.0", "figma-js": "^1.14.0", "helmet": "^7.1.0", "http-status-codes": "^2.2.0", @@ -61,15 +63,15 @@ "jira-client": "^8.2.2", "markdown-it": "^14.0.0", "matrix-appservice-bridge": "^9.0.1", - "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.7.0-specific-device-2", - "matrix-widget-api": "^1.6.0", - "micromatch": "^4.0.5", - "mime": "^4.0.1", + "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@0.7.1-element.7", + "matrix-widget-api": "^1.10.0", + "micromatch": "^4.0.8", + "mime": "^4.0.4", "node-emoji": "^2.1.3", - "p-queue": "^6.6.2", + "parse-duration": "^1.1.0", "preact-render-to-string": "^6.3.1", "prom-client": "^15.1.0", - "quickjs-emscripten": "^0.26.0", + "quickjs-emscripten": "^0.31.0", "reflect-metadata": "^0.2.1", "source-map-support": "^0.5.21", "string-argv": "^0.3.1", @@ -81,10 +83,14 @@ }, "devDependencies": { "@codemirror/lang-javascript": "^6.0.2", + "@eslint/eslintrc": "^3.2.0", + "@eslint/js": "^9.15.0", + "@fontsource/inter": "^5.1.0", "@napi-rs/cli": "^2.13.2", - "@preact/preset-vite": "^2.2.0", + "@octokit/webhooks-types": "^7.6.1", + "@preact/preset-vite": "^2.9.1", "@rollup/plugin-alias": "^5.1.0", - "@tsconfig/node18": "^18.2.2", + "@tsconfig/node22": "^22", "@types/ajv": "^1.0.0", "@types/busboy": "^1.5.4", "@types/chai": "^4.2.22", @@ -96,28 +102,28 @@ "@types/micromatch": "^4.0.1", "@types/mime": "^3.0.4", "@types/mocha": "^10.0.6", - "@types/node": "20.10.6", + "@types/node": "^22", "@types/xml2js": "^0.4.11", - "@typescript-eslint/eslint-plugin": "^6.17.0", - "@typescript-eslint/parser": "^6.17.0", "@uiw/react-codemirror": "^4.12.3", + "babel-cli": "^6.26.0", + "babel-jest": "^29.7.0", "busboy": "^1.6.0", - "chai": "^4.3.4", - "eslint": "^8.49.0", - "eslint-config-preact": "^1.3.0", - "eslint-plugin-mocha": "^10.1.0", - "homerunner-client": "^1.0.0", + "chai": "^4", + "eslint": "^9.15.0", + "eslint-plugin-chai-expect": "^3.1.0", + "eslint-plugin-mocha": "^10.5.0", + "eslint-plugin-react": "^7.37.2", + "homerunner-client": "^1.1.0", "jest": "^29.7.0", - "mini.css": "^3.0.1", - "mocha": "^10.2.0", - "nyc": "^15.1.0", - "preact": "^10.5.15", - "rimraf": "^5.0.5", - "sass": "^1.69.6", - "ts-jest": "^29.1.1", - "ts-node": "^10.9.1", - "typescript": "^5.3.3", - "vite": "^5.0.13" + "mocha": "^10.8.2", + "nyc": "^17.1.0", + "preact": "^10.24.3", + "rimraf": "6.0.1", + "sass": "^1.81.0", + "ts-node": "10.9.2", + "typescript": "^5.7.2", + "typescript-eslint": "^8.16.0", + "vite": "^5.4.11" }, "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" } diff --git a/pkgs/by-name/ma/matrix-hookshot/package.nix b/pkgs/by-name/ma/matrix-hookshot/package.nix index 0d5e0a9b0a741..2c6dc3de7736a 100644 --- a/pkgs/by-name/ma/matrix-hookshot/package.nix +++ b/pkgs/by-name/ma/matrix-hookshot/package.nix @@ -11,7 +11,7 @@ rustc, napi-rs-cli, pkg-config, - nodejs, + nodejs_22, openssl, }: @@ -30,6 +30,7 @@ mkYarnPackage rec { }; packageJSON = ./package.json; + nodejs = nodejs_22; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; @@ -70,7 +71,7 @@ mkYarnPackage rec { ''; postInstall = '' - makeWrapper '${nodejs}/bin/node' "$out/bin/matrix-hookshot" --add-flags \ + makeWrapper '${nodejs_22}/bin/node' "$out/bin/matrix-hookshot" --add-flags \ "$out/libexec/matrix-hookshot/deps/matrix-hookshot/lib/App/BridgeApp.js" ''; diff --git a/pkgs/by-name/ma/matrix-hookshot/pin.json b/pkgs/by-name/ma/matrix-hookshot/pin.json index d6480bcc7a496..cc81e0b96a2aa 100644 --- a/pkgs/by-name/ma/matrix-hookshot/pin.json +++ b/pkgs/by-name/ma/matrix-hookshot/pin.json @@ -1,6 +1,6 @@ { - "version": "5.4.1", - "srcHash": "sha256-SZRMPnX4B7CHIp3aH3hh4NFgkOitpDB2w4jZLtLf4nY=", - "yarnHash": "1rscx9w63hpypwyj5ccnb49iwn581971ajzhfsyz1kmaf87f7hm9", - "cargoHash": "sha256-slH/EcFvJ3gcCsRX3rkelQDlt0elpbXOT/0/oiXN6qg=" + "version": "6.0.1", + "srcHash": "sha256-rs4jIRdGriZ2L02gSTqIYuwLE4Xu3avS5+nyHuSyJ/c=", + "yarnHash": "0sjc333cl115pm3w69aknf20n85r8nisrdjx1231101zrz01nhhh", + "cargoHash": "sha256-lcY0Eq64oPH0CtL4WhVx6L/Ix/m8mHqum/oLQhu6cNc=" } From 7f4daa97d11eb49b52dc70e0b308fecbec0ab5ed Mon Sep 17 00:00:00 2001 From: Nadir Ishiguro <23151917+nadir-ishiguro@users.noreply.github.com> Date: Wed, 18 Dec 2024 20:32:07 +0100 Subject: [PATCH 048/146] vaults: 0.7.1 -> 0.8.0 --- pkgs/by-name/va/vaults/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/va/vaults/package.nix b/pkgs/by-name/va/vaults/package.nix index 1079eaa602a2d..8e854c0d485a9 100644 --- a/pkgs/by-name/va/vaults/package.nix +++ b/pkgs/by-name/va/vaults/package.nix @@ -22,19 +22,19 @@ stdenv.mkDerivation rec { pname = "vaults"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "mpobaschnig"; repo = "Vaults"; - rev = version; - hash = "sha256-jA7OeyRqc5DxkS4sMx9cIbVlZwd++aCQi09uBQik1oA="; + rev = "v${version}"; + hash = "sha256-USVP/7TNdpUNx1kDsCReGYIP8gHUeij2dqy8TR4R+CE="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-l9Zer6d6kgjIUNiQ1VdQQ57caVNWfzCkdsMf79X8Ar4="; + hash = "sha256-h25YRqQ4Z+Af+zHITnmnwpg09V7sik88YRGbG8BZUjg="; }; postPatch = '' From 2160e723a0eb53f75cda2f427d139af34b047573 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 18 Dec 2024 17:10:46 -0500 Subject: [PATCH 049/146] nomad_1_9: 1.9.3 -> 1.9.4 Diff: https://github.com/hashicorp/nomad/compare/v1.9.3...v1.9.4 --- pkgs/applications/networking/cluster/nomad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 6544baff55bed..82d332e70dbff 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -120,9 +120,9 @@ rec { nomad_1_9 = generic { buildGoModule = buildGo123Module; - version = "1.9.3"; - sha256 = "sha256-KjVr9NIL9Qw10EoP/C+2rjtqU2qBSF6SKpIvQWQJWuo="; - vendorHash = "sha256-paUI5mYa9AvMsI0f/VeVdnZzwKS9gsBIb6T4KmugPKQ="; + version = "1.9.4"; + sha256 = "sha256-yhOyHfD5099dCY7lIJzTb8tQrqQ86N8HVtSk5mB7saY="; + vendorHash = "sha256-Cxjgs4Hmv0sq11OpvYLnNcc76ojwqwcxMmCZT5Or0f4="; license = lib.licenses.bsl11; passthru.tests.nomad = nixosTests.nomad; preCheck = '' From 9208d2c78c2032c27199f0622c2fd9082844c31e Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Mon, 18 Nov 2024 11:34:18 +0100 Subject: [PATCH 050/146] maintainers: add WeetHet --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 878b46178b793..7e7cf0f0b3a75 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -24034,6 +24034,12 @@ githubId = 49368953; keys = [ { fingerprint = "D20F C904 A145 8B28 53D8 FBA0 0422 0096 01E4 87FC"; } ]; }; + WeetHet = { + name = "WeetHet"; + matrix = "@weethet:catgirl.cloud"; + github = "WeetHet"; + githubId = 43210583; + }; wegank = { name = "Weijia Wang"; email = "contact@weijia.wang"; From c0449da545ea95bcb2b65dc15c88ef36eb02035c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 01:04:22 +0000 Subject: [PATCH 051/146] delve: 1.23.1 -> 1.24.0 --- pkgs/by-name/de/delve/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/delve/package.nix b/pkgs/by-name/de/delve/package.nix index 24fb3e82c73db..64ec08acd798d 100644 --- a/pkgs/by-name/de/delve/package.nix +++ b/pkgs/by-name/de/delve/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "delve"; - version = "1.23.1"; + version = "1.24.0"; src = fetchFromGitHub { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - hash = "sha256-+qC5fFBuQchz1dMP5AezWkkD2anZshN1wIteKce0Ecw="; + hash = "sha256-R1MTMRAIceHv9apKTV+k4d8KoBaRJSZCflxqhgfQWu4="; }; vendorHash = null; From 2839c08b1a0c3cef09fd149b5116f582428fafef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 02:34:04 +0000 Subject: [PATCH 052/146] python312Packages.flake8-bugbear: 24.10.31 -> 24.12.12 --- pkgs/development/python-modules/flake8-bugbear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix index 4a4c1fc004a69..4a549d78eda01 100644 --- a/pkgs/development/python-modules/flake8-bugbear/default.nix +++ b/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "flake8-bugbear"; - version = "24.10.31"; + version = "24.12.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; tag = version; - hash = "sha256-c8ehpdoW9UvJZIDIMKg63H0w1oD+3DEjwomZYpNNd8M="; + hash = "sha256-ZMIpQUF+aXiq2NG0v19UwhWszrW/l50aJmG4YDV0+Wg="; }; propagatedBuildInputs = [ From 48098a761ff3537b6e165c490d56c3676c5d5655 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 02:37:28 +0000 Subject: [PATCH 053/146] python312Packages.whenever: 0.6.13 -> 0.6.15 --- pkgs/development/python-modules/whenever/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/whenever/default.nix b/pkgs/development/python-modules/whenever/default.nix index 50a6411d021d1..99bb825220bda 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.13"; + version = "0.6.15"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,12 +29,12 @@ buildPythonPackage rec { owner = "ariebovenberg"; repo = "whenever"; rev = "refs/tags/${version}"; - hash = "sha256-JappuvryhFyVUqfgb+4Nk2ULCi3QY7x9p4FqV78qkqI="; + hash = "sha256-zCtHvgAQ05zmT6U7CAspG65fE4tPyS/+/gId048DbeA="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-KWB0PRYKiGNBUKYZn8bCHUjh+oFe818PgKtPdNy1CZA="; + hash = "sha256-sCwjo3KU4u+2FsWz8CJiqXKSaIKX6DFe1eCkIzRXF3s="; }; build-system = [ From 125f80b2238fb89fb745b6081de97d532171211c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 05:50:07 +0000 Subject: [PATCH 054/146] erlang-language-platform: 2024-11-07 -> 2024-12-09 --- pkgs/by-name/er/erlang-language-platform/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/er/erlang-language-platform/package.nix b/pkgs/by-name/er/erlang-language-platform/package.nix index 58d02215ec8ef..39f9538b11004 100644 --- a/pkgs/by-name/er/erlang-language-platform/package.nix +++ b/pkgs/by-name/er/erlang-language-platform/package.nix @@ -14,14 +14,14 @@ let hashes = { linux-aarch64-unknown-linux-gnu = "sha256-Fte7oZD5+aFph5xGrKtbSimb3aHewkjsJRXB+64IW5A="; - linux-x86_64-unknown-linux-gnu = "sha256-tu4uloIyXjq5DjDaU4qxbf8a/S7yv3RsNcUwusfMztw="; + linux-x86_64-unknown-linux-gnu = "sha256-GFf1YybZRyZ3D6ZnLf+op6KRPYbwBHSPh1groxdNZks="; macos-aarch64-apple-darwin = "sha256-3K3sPizBR/+DJIX67GsYqm2X5k7kq3kBRg8P2WALTZs="; macos-x86_64-apple-darwin = "sha256-j+AVmLfe/yCvKvYhL5ikhXA1g+zQ1CDlMl1FYO6q1yA="; }; in stdenv.mkDerivation rec { pname = "erlang-language-platform"; - version = "2024-11-07"; + version = "2024-12-09"; src = fetchurl { url = "https://github.com/WhatsApp/erlang-language-platform/releases/download/${version}/elp-${release}-otp-26.2.tar.gz"; From 30bd8a9a45465a8b591894005f93c6abb46b2d20 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 13:55:38 +0000 Subject: [PATCH 055/146] polypane: 22.0.0 -> 22.1.0 --- pkgs/by-name/po/polypane/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/polypane/package.nix b/pkgs/by-name/po/polypane/package.nix index e14675f70057b..7777b7e1ad66c 100644 --- a/pkgs/by-name/po/polypane/package.nix +++ b/pkgs/by-name/po/polypane/package.nix @@ -6,12 +6,12 @@ let pname = "polypane"; - version = "22.0.0"; + version = "22.1.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="; + sha256 = "sha256-FxrL25NCYP0S0Ge/UegZzqzWMuU93+mROM9AVm3SD9o="; }; appimageContents = appimageTools.extractType2 { From 6f2595bb72f6a88b5227156df202bf199c03a11d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Dec 2024 12:46:15 +0000 Subject: [PATCH 056/146] python312Packages.ome-zarr: 0.9.0 -> 0.10.2 --- .../python-modules/ome-zarr/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/ome-zarr/default.nix b/pkgs/development/python-modules/ome-zarr/default.nix index ae082ec7d8574..d20e3a88845f5 100644 --- a/pkgs/development/python-modules/ome-zarr/default.nix +++ b/pkgs/development/python-modules/ome-zarr/default.nix @@ -11,24 +11,30 @@ numpy, requests, scikit-image, + setuptools, toolz, zarr, }: buildPythonPackage rec { pname = "ome-zarr"; - version = "0.9.0"; - format = "setuptools"; - disabled = pythonOlder "3.6"; + version = "0.10.2"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "ome"; repo = "ome-zarr-py"; - rev = "refs/tags/v${version}"; - hash = "sha256-YOG9+ONf2OnkSZBL/Vb8Inebx4XDSGJb2fqypaWebhY="; + tag = "v${version}"; + hash = "sha256-USWMae7sBY6P/Sf4418ne/y8gZlz6mcYhSfJtlxJvGI="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ numpy dask distributed @@ -81,12 +87,12 @@ buildPythonPackage rec { "ome_zarr.utils" ]; - meta = with lib; { + meta = { description = "Implementation of next-generation file format (NGFF) specifications for storing bioimaging data in the cloud"; homepage = "https://pypi.org/project/ome-zarr"; changelog = "https://github.com/ome/ome-zarr-py/blob/v${version}/CHANGELOG.md"; - license = licenses.bsd2; - maintainers = [ maintainers.bcdarwin ]; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.bcdarwin ]; mainProgram = "ome_zarr"; }; } From 616917025ad1720bdeec7257add6e8badd5069da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 14:04:36 +0000 Subject: [PATCH 057/146] terraform-providers.temporalcloud: 0.0.15 -> 0.5.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0360cbf823914..babae682985b2 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1246,13 +1246,13 @@ "vendorHash": "sha256-tb9raTGqEuvqfMO/5s4Oc7x/EAk4qBWWDiOgRMB3uAU=" }, "temporalcloud": { - "hash": "sha256-QDLqRG8gvEycs1zzPyNKr5nT4t7LT7gzPNJ76PAZW8M=", + "hash": "sha256-nAOHdok/nK33zyEYmyB2nA+y2/mpkigZk4WTyl2F7XA=", "homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud", "owner": "temporalio", "repo": "terraform-provider-temporalcloud", - "rev": "v0.0.15", + "rev": "v0.5.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-IuPCApBHevlxUPdLzyUirN/PKU8UF8MoUhUaO8pWNDw=" + "vendorHash": "sha256-VMEL2dQ1+kMRWjJP6Obc3N1OytpAkRVW/9596WhwkE4=" }, "tencentcloud": { "hash": "sha256-P2IvcZHlKFGJcr5ayRmdJpAYmU3mJcVIOll5vZlvkQc=", From e0b47f9c7f197f84484abaf0036e5e349ddd1e61 Mon Sep 17 00:00:00 2001 From: Rishik Yalamanchili <73787402+Rishik-Y@users.noreply.github.com> Date: Thu, 19 Dec 2024 20:09:18 +0530 Subject: [PATCH 058/146] kitty: 0.37.0 -> 0.38.0 --- pkgs/applications/terminal-emulators/kitty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 3bc1d4f8d4d30..2bde298a7faf8 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -35,20 +35,20 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.37.0"; + version = "0.38.0"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "refs/tags/v${version}"; - hash = "sha256-xxM5nqEr7avtJUlcsrA/KXOTxSajIg7kDQM6Q4V+6WM="; + hash = "sha256-XURoUYo0Nejcfi49s9AlyoG5fpE0/mjMke2UWG8lUiA="; }; goModules = (buildGo123Module { pname = "kitty-go-modules"; inherit src version; - vendorHash = "sha256-d5jRhOm53HDGnsU5Lg5tVGU/9z8RGqORzS53hOyIKBk="; + vendorHash = "sha256-K12P81jE7oOU7qX2yQ+VtVHX/igKG0nPMSBkZ7wsR0o="; }).goModules; buildInputs = [ From d3ec16047d35eef2453b6e308e2104e6275a5051 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 14:40:45 +0000 Subject: [PATCH 059/146] kubeshark: 52.3.91 -> 52.3.92 --- pkgs/by-name/ku/kubeshark/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ku/kubeshark/package.nix b/pkgs/by-name/ku/kubeshark/package.nix index 11da56244cd42..177317ea93b28 100644 --- a/pkgs/by-name/ku/kubeshark/package.nix +++ b/pkgs/by-name/ku/kubeshark/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "kubeshark"; - version = "52.3.91"; + version = "52.3.92"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = "v${version}"; - hash = "sha256-xkfEhCkG2qnoMZ7l48mK56PemtQBHK46p4jLxR9GHxc="; + hash = "sha256-WMReA7ElZpsWiWJx+H2wKiaScGc1t06pj4hWKfkfbJo="; }; vendorHash = "sha256-kzyQW4bVE7oMOlHVG7LKG1AMTRYa5GLiiEhdarIhMSo="; From 5c3b9ec008a751f1ea2a2b27a35362f9a03d94f4 Mon Sep 17 00:00:00 2001 From: Savyasachee Jha Date: Thu, 19 Dec 2024 20:13:36 +0530 Subject: [PATCH 060/146] firefly-iii: 6.1.24 -> 6.1.25 --- pkgs/by-name/fi/firefly-iii/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix index 70b8da259218a..22b3b9447dde7 100644 --- a/pkgs/by-name/fi/firefly-iii/package.nix +++ b/pkgs/by-name/fi/firefly-iii/package.nix @@ -13,13 +13,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "firefly-iii"; - version = "6.1.24"; + version = "6.1.25"; src = fetchFromGitHub { owner = "firefly-iii"; repo = "firefly-iii"; rev = "v${finalAttrs.version}"; - hash = "sha256-ZB0yaGHL1AI67i2ixUzuWyiBjXJNlDV4APBahDuNObI="; + hash = "sha256-6DZwTk67bKvgB+Zf7aPakrWWYCAjkYggrRiaFKgsMkk="; }; buildInputs = [ php83 ]; @@ -38,12 +38,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-6sOmW+CFuNEBVHpZwh/wjrIINPdcPJUvosmdLaCvZlw="; + vendorHash = "sha256-5uUjb5EPcoEBuFbWGb1EIC/U/VaSUsRp09S9COIx25E="; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; name = "${finalAttrs.pname}-npm-deps"; - hash = "sha256-W3lV0LbmOPfIwStNf4IwBVorSFHIlpyuIk+17/V/Y2Y="; + hash = "sha256-j49iltvW7xGOCV+FIB4f+ECfQo50U+wTugyaK9JGN3A="; }; composerRepository = php83.mkComposerRepository { From 51bed7030fea8f3242a05e0d7f385152e7740d64 Mon Sep 17 00:00:00 2001 From: Savyasachee Jha Date: Thu, 19 Dec 2024 20:13:58 +0530 Subject: [PATCH 061/146] nixos/firefly-iii: Improved cache clearing --- nixos/modules/services/web-apps/firefly-iii.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/web-apps/firefly-iii.nix b/nixos/modules/services/web-apps/firefly-iii.nix index 92b4cb2268857..42d6cdcb06b37 100644 --- a/nixos/modules/services/web-apps/firefly-iii.nix +++ b/nixos/modules/services/web-apps/firefly-iii.nix @@ -31,6 +31,7 @@ let ${lib.optionalString ( cfg.settings.DB_CONNECTION == "sqlite" ) "touch ${cfg.dataDir}/storage/database/database.sqlite"} + ${artisan} optimize:clear rm ${cfg.dataDir}/cache/*.php ${artisan} package:discover ${artisan} firefly-iii:upgrade-database @@ -318,6 +319,7 @@ in } // commonServiceConfig; unitConfig.JoinsNamespaceOf = "phpfpm-firefly-iii.service"; restartTriggers = [ cfg.package ]; + partOf = [ "phpfpm-firefly-iii.service" ]; }; systemd.services.firefly-iii-cron = { From ff555632e30bdf2631fad188ea158f4fd5a1e093 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 15:16:09 +0000 Subject: [PATCH 062/146] terraform-providers.akamai: 6.6.0 -> 6.6.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0360cbf823914..eed7eca5b0bd8 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -36,13 +36,13 @@ "vendorHash": "sha256-i05xL00hcJ8qAVyeQD5sQhv5ASM4fWdryAe7KBlNdHY=" }, "akamai": { - "hash": "sha256-v1Y34+SoxVyBqO6QOCrfHFf+ng8ER3ngw8+0HDrB4Hc=", + "hash": "sha256-acGLXJclAfg43AkJRoROReIOjBEnhgSpDRgvO6LumIY=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v6.6.0", + "rev": "v6.6.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-PUKSCQwVUkEfvGpk18joVnHGdacsiOB/Xk5yE4Y6Nbg=" + "vendorHash": "sha256-3AlXMOpL5kctTSnA2V1RsMxRb9roELs1p5TL0uJFR4M=" }, "alicloud": { "hash": "sha256-CWXA7Ljd9wx0c5toLszQFfGqAGPNVpm3pSvzbVnCrtI=", From 7be8603fab3b4cb16e508e04d76d92aaf8d3e580 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Thu, 19 Dec 2024 19:29:31 +0300 Subject: [PATCH 063/146] microfetch: 0.4.2 -> 0.4.4; use `tag` in fetcher --- pkgs/by-name/mi/microfetch/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mi/microfetch/package.nix b/pkgs/by-name/mi/microfetch/package.nix index 25be372aecc35..710eb41325fb6 100644 --- a/pkgs/by-name/mi/microfetch/package.nix +++ b/pkgs/by-name/mi/microfetch/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "microfetch"; - version = "0.4.2"; + version = "0.4.4"; src = fetchFromGitHub { owner = "NotAShelf"; repo = "microfetch"; - rev = "refs/tags/v${version}"; - hash = "sha256-EfQs9CdbWhf/elujUO/N3TU5TiQJalYMqRGbPIGiMwg="; + tag = "v${version}"; + hash = "sha256-SY7Eln0Hwj0VWqzzYfqsVpAMES+SCiZkLgNZR3a8d7A="; }; - cargoHash = "sha256-/pRkF8xp0bOsliJPlQNQBkkeSf1cFe+yBo4CzMbcnKM="; + cargoHash = "sha256-a9iPTMPviHqXanqB7k2ecdkSJ2RwSErj8BWeqNUPiAo="; passthru.updateScript = nix-update-script { }; From 0f7174cdc91c3f8735b1633f1356fbfdff486013 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 20:18:12 +0000 Subject: [PATCH 064/146] obs-studio-plugins.obs-3d-effect: 0.1.2 -> 0.1.3 --- pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix b/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix index 942e01e5cc710..92e3a2113d511 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "obs-3d-effect"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-3d-effect"; rev = version; - sha256 = "sha256-BJumEIxJTXZgPxXhxfT6zdZctCHFXb26EdnsYtA8ztE="; + sha256 = "sha256-SgxrBhuO3IaqINwjwdtn31cIcu3hXiPZyVMZJiNsO+s="; }; nativeBuildInputs = [ cmake ]; From 213f4d95bf5f5f23ed21c1c708c91f94c8ac2039 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 19 Dec 2024 14:15:08 -0600 Subject: [PATCH 065/146] luarocks-packages-updater: handle errors better --- .../lu/luarocks-packages-updater/updater.py | 66 +++++++++++-------- 1 file changed, 39 insertions(+), 27 deletions(-) diff --git a/pkgs/by-name/lu/luarocks-packages-updater/updater.py b/pkgs/by-name/lu/luarocks-packages-updater/updater.py index e60fb0484fa18..05824c9e07d59 100755 --- a/pkgs/by-name/lu/luarocks-packages-updater/updater.py +++ b/pkgs/by-name/lu/luarocks-packages-updater/updater.py @@ -127,7 +127,7 @@ def get_update( config: FetchConfig, # TODO: implement support for adding/updating individual plugins to_update: list[str] | None, - ): + ): if to_update is not None: raise NotImplementedError("For now, lua updater doesn't support updating individual packages.") _prefetch = generate_pkg_nix @@ -142,7 +142,15 @@ def update() -> dict: finally: pass - self.generate_nix(results, output_file) + successful_results = [(plug, nix_expr) for plug, nix_expr, error in results if nix_expr is not None] + errors = [(plug, error) for plug, nix_expr, error in results if error is not None] + + self.generate_nix(successful_results, output_file) + + if errors: + log.error("The following plugins failed to update:") + for plug, error in errors: + log.error("%s: %s", plug.name, error) redirects = {} return redirects @@ -171,39 +179,43 @@ def generate_pkg_nix(plug: LuaPlugin): """ log.debug("Generating nix expression for %s", plug.name) - cmd = ["luarocks", "nix"] + try: + cmd = ["luarocks", "nix"] - if plug.maintainers: - cmd.append(f"--maintainers={plug.maintainers}") + if plug.maintainers: + cmd.append(f"--maintainers={plug.maintainers}") - 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 - log.warning(msg) + 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 + log.warning(msg) - log.debug("Updating from rockspec %s", plug.rockspec) - cmd.append(plug.rockspec) + log.debug("Updating from rockspec %s", plug.rockspec) + cmd.append(plug.rockspec) - # update the plugin from luarocks - else: - cmd.append(plug.name) - if plug.version and plug.version != "src": - cmd.append(plug.version) + # update the plugin from luarocks + else: + cmd.append(plug.name) + if plug.version and plug.version != "src": + cmd.append(plug.version) - if plug.server != "src" and plug.server: - cmd.append(f"--only-server={plug.server}") + if plug.server != "src" and plug.server: + cmd.append(f"--only-server={plug.server}") - if plug.luaversion: - cmd.append(f"--lua-version={plug.luaversion}") - luaver = plug.luaversion.replace(".", "") - if luaver := os.getenv(f"LUA_{luaver}"): - cmd.append(f"--lua-dir={luaver}") + if plug.luaversion: + cmd.append(f"--lua-version={plug.luaversion}") + luaver = plug.luaversion.replace(".", "") + if luaver := os.getenv(f"LUA_{luaver}"): + cmd.append(f"--lua-dir={luaver}") - log.debug("running %s", " ".join(cmd)) + log.debug("running %s", " ".join(cmd)) - output = subprocess.check_output(cmd, text=True) - output = "callPackage(" + output.strip() + ") {};\n\n" - return (plug, output) + output = subprocess.check_output(cmd, text=True) + output = "callPackage(" + output.strip() + ") {};\n\n" + return (plug, output, None) + except subprocess.CalledProcessError as e: + log.error("Failed to generate nix expression for %s: %s", plug.name, e) + return (plug, None, str(e)) def main(): From ee1ce400e1deef5ffef6ae47af67f4d44f1fd25a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 21:06:15 +0000 Subject: [PATCH 066/146] typos: 1.28.2 -> 1.28.4 --- pkgs/by-name/ty/typos/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix index 537a5459d6d5b..47b1df5a651dc 100644 --- a/pkgs/by-name/ty/typos/package.nix +++ b/pkgs/by-name/ty/typos/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.28.2"; + version = "1.28.4"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-6qu5Xe0lDT8u21VxU9lqs2BTre7BRa7+qNf8oukzTmc="; + hash = "sha256-rE1JK6bG8yNItzsXEggTqKFuIwlFLDnIlNBUCjb9XOg="; }; - cargoHash = "sha256-lC0K56eslfePdZfP75Lz6XRh3LORsAPShC15ZFj/UG4="; + cargoHash = "sha256-DQWOAlVKtB0l0qaHCgsrUl239PcKDnic3kdKoSgOjik="; passthru = { tests.version = testers.testVersion { package = typos; }; From 49dc2357b83899b7ed753946d7ec100d3ebf8051 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Tue, 17 Dec 2024 17:54:44 +0100 Subject: [PATCH 067/146] dotnet: Avoid double escaping of path Paths with spaces were escaped within the quotes, resulting in situations like this one: ``` $ nix-shell maintainers/scripts/update.nix --argstr package nexusmods-app [omitted] realpath: "'/home/username/my projects/nixpkgs/pkgs/by-name/ne/nexusmods-app/deps.nix'": No such file or directory ``` Co-authored-by: Matt Sturgeon --- pkgs/build-support/dotnet/add-nuget-deps/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/dotnet/add-nuget-deps/default.nix b/pkgs/build-support/dotnet/add-nuget-deps/default.nix index 38ed44cdc7726..9ea46394e4b14 100644 --- a/pkgs/build-support/dotnet/add-nuget-deps/default.nix +++ b/pkgs/build-support/dotnet/add-nuget-deps/default.nix @@ -114,7 +114,8 @@ attrs # this needs to be before TMPDIR is changed, so the output isn't deleted # if it uses mktemp - depsFile=$(realpath "''${1:-${lib.escapeShellArg defaultDepsFile}}") + ${lib.toShellVars { inherit defaultDepsFile; }} + depsFile=$(realpath "''${1:-$defaultDepsFile}") export TMPDIR TMPDIR=$(mktemp -d -t fetch-deps-${lib.escapeShellArg finalPackage.name}.XXXXXX) From e8f64bb8369293603d6cd4613d98504af046e10b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 21:30:58 +0000 Subject: [PATCH 068/146] files-cli: 2.13.202 -> 2.13.209 --- pkgs/by-name/fi/files-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index 6526a677f714a..bb7a572ec847a 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.13.202"; + version = "2.13.209"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-/xXAEFk4LlwZ/to2MZY9W3Euy6DcbGO3inRKvMFEXis="; + hash = "sha256-plqYfVgDDx7DDkLIWJOA/GQESvUXw3cumIGdKBAGA1Q="; }; - vendorHash = "sha256-RLWcYxWa8lovkPoA3Tz76wvlvSixUMtLG7VircQaWmY="; + vendorHash = "sha256-T89iIx7ZTwn/k2qiixSG2QCJs8s/9lzJY+yK0dik+Wg="; ldflags = [ "-s" From 1cd936a4161df8bf52916ffb42c5f84b518570e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 21:42:58 +0000 Subject: [PATCH 069/146] pulsarctl: 4.0.0.8 -> 4.0.0.10 --- pkgs/by-name/pu/pulsarctl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pu/pulsarctl/package.nix b/pkgs/by-name/pu/pulsarctl/package.nix index df1f75db3e145..66fc34348ebb5 100644 --- a/pkgs/by-name/pu/pulsarctl/package.nix +++ b/pkgs/by-name/pu/pulsarctl/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "pulsarctl"; - version = "4.0.0.8"; + version = "4.0.0.10"; src = fetchFromGitHub { owner = "streamnative"; repo = "pulsarctl"; rev = "v${version}"; - hash = "sha256-+td/kQlP978Tuuop0qGFrnRXMZXSa53GRuwwfyUOOmg="; + hash = "sha256-yV9WfttBoUTFgCj1CFDLPf+CCJLNzduIkZprSAJuOC0="; }; vendorHash = "sha256-wNUTJn7Ar+GlePEhdr6xeolAiltJdAoIs5o5uDo8Ibs="; From deaccc85473829dedffa9539d8fb898c7408c035 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 22:01:44 +0000 Subject: [PATCH 070/146] terraform-providers.ovh: 1.1.0 -> 1.2.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0360cbf823914..a1398110e1652 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -967,11 +967,11 @@ "vendorHash": null }, "ovh": { - "hash": "sha256-zLTtr1S7A3ULi+sPBO3LYVhHx6OElRVJcvjK5cfrFLI=", + "hash": "sha256-vHe/Yrz4vTWFJrbd4raQpbioxm6PXaValf/KW6uHmxs=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v1.1.0", + "rev": "v1.2.0", "spdx": "MPL-2.0", "vendorHash": null }, From a1e39c0cc45af2e854f6d9ef98e477d8f6a966b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 22:55:26 +0000 Subject: [PATCH 071/146] terraform-providers.kubernetes: 2.34.0 -> 2.35.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0360cbf823914..565747eac6213 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -714,11 +714,11 @@ "vendorHash": "sha256-pE0WujGxCMW0/27F8aaNtyIHdsOJTwEJL+bdiHpzu7s=" }, "kubernetes": { - "hash": "sha256-CCzT8B/73PEtU9/nAJrQ2ZBr9ra8QH+TOcQtISHiUAI=", + "hash": "sha256-gHLEk5CpF4btfSwrpiDJv2lyBdoewf1uLyioj1CQjm0=", "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", "repo": "terraform-provider-kubernetes", - "rev": "v2.34.0", + "rev": "v2.35.0", "spdx": "MPL-2.0", "vendorHash": "sha256-PfvIzUugDsnMKW7mSM2GyJZpXi3wJsEhYLKzlKq1U6A=" }, From e92787d61a276af3802b1b59124dc88bef7c48b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 23:12:34 +0000 Subject: [PATCH 072/146] amdgpu_top: 0.10.0 -> 0.10.1 --- pkgs/by-name/am/amdgpu_top/Cargo.lock | 234 +++++++++++++------------ pkgs/by-name/am/amdgpu_top/package.nix | 6 +- 2 files changed, 126 insertions(+), 114 deletions(-) diff --git a/pkgs/by-name/am/amdgpu_top/Cargo.lock b/pkgs/by-name/am/amdgpu_top/Cargo.lock index 8707a72ce3f7e..fde45fcde12c9 100644 --- a/pkgs/by-name/am/amdgpu_top/Cargo.lock +++ b/pkgs/by-name/am/amdgpu_top/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "ab_glyph" @@ -59,13 +59,13 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "amdgpu_top" -version = "0.10.0" +version = "0.10.1" dependencies = [ "amdgpu_top_gui", "amdgpu_top_json", @@ -77,7 +77,7 @@ dependencies = [ [[package]] name = "amdgpu_top_gui" -version = "0.10.0" +version = "0.10.1" dependencies = [ "eframe", "egui_plot", @@ -89,7 +89,7 @@ dependencies = [ [[package]] name = "amdgpu_top_json" -version = "0.10.0" +version = "0.10.1" dependencies = [ "libamdgpu_top", "serde_json", @@ -97,10 +97,11 @@ dependencies = [ [[package]] name = "amdgpu_top_tui" -version = "0.10.0" +version = "0.10.1" dependencies = [ "cursive", "libamdgpu_top", + "termsize", ] [[package]] @@ -141,9 +142,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" +checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" [[package]] name = "arboard" @@ -270,9 +271,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a68f1f47cdf0ec8ee4b941b2eee2a80cb796db73118c0dd09ac63fbe405be22" +checksum = "786a307d683a5bf92e6fd5fd69a7eb613751668d1d8d67d802846dfe367c62c8" dependencies = [ "memchr", "regex-automata", @@ -302,7 +303,7 @@ checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -313,9 +314,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "calloop" @@ -345,9 +346,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.1" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" +checksum = "9157bbaa6b165880c27a4293a474c91cdcf265cc68cc829bf10be0964a391caf" dependencies = [ "jobserver", "libc", @@ -636,7 +637,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -647,7 +648,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -697,7 +698,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -892,7 +893,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -903,7 +904,7 @@ checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -924,7 +925,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -959,12 +960,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -981,15 +982,15 @@ checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" [[package]] name = "fastrand" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "fdeflate" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07c6f4c64c1d33a3111c4466f7365ebdcc37c5bd1ea0d62aae2e3d722aacbedb" +checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c" dependencies = [ "simd-adler32", ] @@ -1081,7 +1082,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1189,7 +1190,7 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6ffbeb3a5c0b8b84c3fe4133a6f8c82fa962f4caefe8d0762eced025d3eb4f7" dependencies = [ - "thiserror 2.0.3", + "thiserror 2.0.7", ] [[package]] @@ -1237,7 +1238,7 @@ dependencies = [ "bstr", "gix-path", "libc", - "thiserror 2.0.3", + "thiserror 2.0.7", ] [[package]] @@ -1362,7 +1363,7 @@ checksum = "999ce923619f88194171a67fb3e6d613653b8d4d6078b529b15a765da0edcc17" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1432,7 +1433,7 @@ dependencies = [ "gix-trace", "home", "once_cell", - "thiserror 2.0.3", + "thiserror 2.0.7", ] [[package]] @@ -1443,7 +1444,7 @@ checksum = "64a1e282216ec2ab2816cd57e6ed88f8009e634aec47562883c05ac8a7009a63" dependencies = [ "bstr", "gix-utils", - "thiserror 2.0.3", + "thiserror 2.0.7", ] [[package]] @@ -1793,7 +1794,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.89", + "syn 2.0.90", "unic-langid", ] @@ -1807,7 +1808,7 @@ dependencies = [ "i18n-config", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1925,7 +1926,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1969,9 +1970,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", "hashbrown 0.15.2", @@ -2035,10 +2036,11 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.72" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -2067,7 +2069,7 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libamdgpu_top" -version = "0.10.0" +version = "0.10.1" dependencies = [ "anyhow", "libdrm_amdgpu_sys", @@ -2075,23 +2077,23 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.166" +version = "0.2.168" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ccc108bbc0b1331bd061864e7cd823c0cab660bbe6970e66e2c0614decde36" +checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" [[package]] name = "libdrm_amdgpu_sys" -version = "0.7.6" -source = "git+https://github.com/Umio-Yasuno/libdrm-amdgpu-sys-rs#922e364e6bc5d069c7030d60f1472b9fa915e45c" +version = "0.7.7" +source = "git+https://github.com/Umio-Yasuno/libdrm-amdgpu-sys-rs#b5e3441c39ea680871a255c702addbf24c90118a" dependencies = [ "libc", ] [[package]] name = "libloading" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", "windows-targets 0.52.6", @@ -2105,7 +2107,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", - "redox_syscall 0.5.7", + "redox_syscall 0.5.8", ] [[package]] @@ -2376,7 +2378,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -2671,7 +2673,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.7", + "redox_syscall 0.5.8", "smallvec", "windows-targets 0.52.6", ] @@ -2705,7 +2707,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -2722,9 +2724,9 @@ checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "png" -version = "0.17.14" +version = "0.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0" +checksum = "b67582bd5b65bdff614270e2ea89a1cf15bef71245cc1e5f7ea126977144211d" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -2794,7 +2796,7 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -2853,9 +2855,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ "bitflags 2.6.0", ] @@ -2927,7 +2929,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.89", + "syn 2.0.90", "walkdir", ] @@ -2949,15 +2951,15 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.41" +version = "0.38.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" +checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" dependencies = [ "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2993,33 +2995,33 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" dependencies = [ - "self_cell 1.0.4", + "self_cell 1.1.0", ] [[package]] name = "self_cell" -version = "1.0.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" +checksum = "c2fdfc24bc566f839a2da4c4295b82db7d25a24253867d5c64355abb5799bdbe" [[package]] name = "serde" -version = "1.0.215" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.215" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -3202,9 +3204,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.89" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -3219,7 +3221,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -3244,6 +3246,16 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "termsize" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f11ff5c25c172608d5b85e2fb43ee9a6d683a7f4ab7f96ae07b3d8b590368fd" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "thiserror" version = "1.0.69" @@ -3255,11 +3267,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.3" +version = "2.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" +checksum = "93605438cbd668185516ab499d589afb7ee1859ea3d5fc8f6b0755e1c7443767" dependencies = [ - "thiserror-impl 2.0.3", + "thiserror-impl 2.0.7", ] [[package]] @@ -3270,25 +3282,25 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] name = "thiserror-impl" -version = "2.0.3" +version = "2.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" +checksum = "e1d8749b4531af2117677a5fcd12b1348a3fe2b81e36e61ffeac5c4aa3273e36" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] name = "time" -version = "0.3.36" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -3309,9 +3321,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ "num-conv", "time-core", @@ -3386,9 +3398,9 @@ checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" [[package]] name = "ttf-parser" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5902c5d130972a0000f60860bfbf46f7ca3db5391eddfedd1b8728bd9dc96c0e" +checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31" [[package]] name = "type-map" @@ -3510,9 +3522,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" dependencies = [ "cfg-if", "once_cell", @@ -3521,36 +3533,36 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.45" +version = "0.4.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" +checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3558,22 +3570,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" [[package]] name = "wayland-backend" @@ -3686,9 +3698,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.72" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" dependencies = [ "js-sys", "wasm-bindgen", @@ -3706,9 +3718,9 @@ dependencies = [ [[package]] name = "webbrowser" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5f07fb9bc8de2ddfe6b24a71a75430673fd679e568c48b52716cef1cfae923" +checksum = "ea9fe1ebb156110ff855242c1101df158b822487e4957b0556d9ffce9db0f535" dependencies = [ "block2", "core-foundation 0.10.0", @@ -4232,9 +4244,9 @@ checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" [[package]] name = "xml-rs" -version = "0.8.23" +version = "0.8.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af310deaae937e48a26602b730250b4949e125f468f11e6990be3e5304ddd96f" +checksum = "ea8b391c9a790b496184c29f7f93b9ed5b16abb306c05415b68bcc16e4d06432" [[package]] name = "yoke" @@ -4256,7 +4268,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", "synstructure", ] @@ -4277,7 +4289,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -4297,7 +4309,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", "synstructure", ] @@ -4320,5 +4332,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] diff --git a/pkgs/by-name/am/amdgpu_top/package.nix b/pkgs/by-name/am/amdgpu_top/package.nix index 11049743ea705..a725f55b0c769 100644 --- a/pkgs/by-name/am/amdgpu_top/package.nix +++ b/pkgs/by-name/am/amdgpu_top/package.nix @@ -16,19 +16,19 @@ rustPlatform.buildRustPackage rec { pname = "amdgpu_top"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "Umio-Yasuno"; repo = pname; rev = "v${version}"; - hash = "sha256-lX4NC69UhrrHcGoVUJ2dknK6HUwwKm934js/vCnTO2E="; + hash = "sha256-1OPaQcjrUaYTvMrOPcTemGs8DPn3NuuIbaIObxLiCt0="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "libdrm_amdgpu_sys-0.7.6" = "sha256-xf1tQYct5SlRAavW9dHkcCQa4zBehD2XJ4jUE7lblPc="; + "libdrm_amdgpu_sys-0.7.7" = "sha256-gPK3BrW2oTCQDRvHJGY28EFmkKrVexY2bGXG2QwHZL0="; }; }; From 037233e2971ad860cfb4e14e8544efa333d555ab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 20 Dec 2024 00:13:03 +0100 Subject: [PATCH 073/146] python312Packages.pymodbus: 3.8.0 -> 3.8.1 Diff: https://github.com/pymodbus-dev/pymodbus/compare/refs/tags/v3.8.0...v3.8.1 Changelog: https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.8.1 --- pkgs/development/python-modules/pymodbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index 2192cc9363165..013a577200cde 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.8.0"; + version = "3.8.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "pymodbus-dev"; repo = "pymodbus"; rev = "refs/tags/v${version}"; - hash = "sha256-x7ISAQGCb6Utc4aLSZMqn9sVE15VgfI+JooDyBAU65g="; + hash = "sha256-WuQddane7NPqGo6EHBPlFAZDmkcksDdWmHKdVSsSf+o="; }; postPatch = '' From 8df845ea39eb1a2d4576d2170cb9aa5204c5f161 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 23:24:04 +0000 Subject: [PATCH 074/146] terraform-providers.auth0: 1.8.0 -> 1.9.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0360cbf823914..bb2c05daa354d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -90,13 +90,13 @@ "vendorHash": "sha256-RtBEXTkmPPccNmbPLNAnF1L8kinL46uBLZVMqO3887I=" }, "auth0": { - "hash": "sha256-x4fi3huCQ82MBdy75+je6x4bj4yxyoaJM1GyQ29R1GA=", + "hash": "sha256-BBMWsBMuR361tDVGMtQB97Fd7PsuZYK6qBwacG569vA=", "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", "repo": "terraform-provider-auth0", - "rev": "v1.8.0", + "rev": "v1.9.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-TK9JPkwcrBAjC4D96Lsjldt7OegHZ/l9UjP7YG7BPhA=" + "vendorHash": "sha256-ez/qfjqPu8IOHcc5q2OpHm0zO762DXsWvg2vLM8hVas=" }, "avi": { "hash": "sha256-ErZE6MA8Pn8KDDZLX2/yoeqck78vDAcFYdMhYMbcYuI=", From fc0c88834a41209bb9c3ee46da9df0148ea7b61f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 23:45:16 +0000 Subject: [PATCH 075/146] prometheus-pve-exporter: 3.4.6 -> 3.4.7 --- pkgs/servers/monitoring/prometheus/pve-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/pve-exporter.nix b/pkgs/servers/monitoring/prometheus/pve-exporter.nix index 1ffd7baaace54..6a33e12071294 100644 --- a/pkgs/servers/monitoring/prometheus/pve-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/pve-exporter.nix @@ -7,11 +7,11 @@ python3.pkgs.buildPythonApplication rec { pname = "prometheus_pve_exporter"; - version = "3.4.6"; + version = "3.4.7"; src = fetchPypi { inherit pname version; - hash = "sha256-V+/SeQEBRfH9vVYR43sZI0SuPSDaQqXeuy958f6txm0="; + hash = "sha256-AxjtVgow1aV0vSuSre6s9c7Ru2/U6Q6knmq7B05YCnM="; }; propagatedBuildInputs = with python3.pkgs; [ From 543e5ec9289645880984a3c99a142ac65947b2af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 23:52:05 +0000 Subject: [PATCH 076/146] okteto: 3.2.1 -> 3.2.2 --- pkgs/by-name/ok/okteto/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix index 2bc8a4a3d63a7..f53dfc00069dc 100644 --- a/pkgs/by-name/ok/okteto/package.nix +++ b/pkgs/by-name/ok/okteto/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "okteto"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-h8iDTxdcmczmc1THfl4Kwb67fZgzztw0SCHvhF4HdSQ="; + hash = "sha256-NN6Y+QkER5Bs9vy09Y4Dl4LoK3HkCJ04vCe5ectFUok="; }; vendorHash = "sha256-/V95521PFvLACuXVjqsW3TEHHGQYKY8CSAOZ6FwuR0k="; From dcc89e6e1085f2eebe248ea2a9414cb41714b5eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 00:43:39 +0000 Subject: [PATCH 077/146] cadical: 2.1.0 -> 2.1.1 --- pkgs/by-name/ca/cadical/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/cadical/package.nix b/pkgs/by-name/ca/cadical/package.nix index ea2c0a162792f..8581b17225bfd 100644 --- a/pkgs/by-name/ca/cadical/package.nix +++ b/pkgs/by-name/ca/cadical/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, copyPkgconfigItems, makePkgconfigItem, - version ? "2.1.0", + version ? "2.1.1", }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { rev = "rel-${version}"; hash = { - "2.1.0" = "sha256-sSvJgHxsRaJ/xHEK32fox0MFI7u+pj5ERLfNn2s8kC8="; + "2.1.1" = "sha256-1/qJGGyx+hGZ09pIT2uNykotaYlU8BCKArblYhHsMxo="; "2.0.0" = "sha256-qoeEM9SdpuFuBPeQlCzuhPLcJ+bMQkTUTGiT8QdU8rc="; } .${version}; From 7423c8a2b93bb7e949e7fdbf059c1dcc985d8269 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 01:22:51 +0000 Subject: [PATCH 078/146] go-secdump: 0.3.0 -> 0.4.0 --- pkgs/by-name/go/go-secdump/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/go-secdump/package.nix b/pkgs/by-name/go/go-secdump/package.nix index 5b92d99204892..c8d965c3c9eca 100644 --- a/pkgs/by-name/go/go-secdump/package.nix +++ b/pkgs/by-name/go/go-secdump/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "go-secdump"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "jfjallid"; repo = "go-secdump"; rev = "refs/tags/${version}"; - hash = "sha256-RdbrxnyP9QKkrWRLxnWljlwjJHbK++f/U0WdyB9XDc0="; + hash = "sha256-HZAt/lSe13OjCjpJMNCvWoenhCMc2YGoys0S1eiLeKo="; }; - vendorHash = "sha256-RvbK0ps/5Jg/IAk71WGYEcjM6LrbCSkUueSOUFeELis="; + vendorHash = "sha256-hqbLfhUJSSWCdt+f1Z9Pn4TYEWytqAZxwWpqxlrlN9o="; ldflags = [ "-s" From 1973e2a627a7614395a336f113cb2a23be7add44 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 19 Dec 2024 20:43:29 -0500 Subject: [PATCH 079/146] lib2geom: fix cross compilation gtest is required unconditionally since we are always building the test binaries --- pkgs/by-name/li/lib2geom/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/li/lib2geom/package.nix b/pkgs/by-name/li/lib2geom/package.nix index 13e9219537fab..8e86b6e87f2af 100644 --- a/pkgs/by-name/li/lib2geom/package.nix +++ b/pkgs/by-name/li/lib2geom/package.nix @@ -41,9 +41,6 @@ stdenv.mkDerivation rec { gsl cairo double-conversion - ]; - - nativeCheckInputs = [ gtest ]; From 3ad5810cd2c526e23f2e942b956151fc70afe15a Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 19 Dec 2024 20:59:46 -0500 Subject: [PATCH 080/146] lxcfs: fix cross compilation --- pkgs/by-name/lx/lxcfs/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/lx/lxcfs/package.nix b/pkgs/by-name/lx/lxcfs/package.nix index 31008cc96a4a7..ea42cec436724 100644 --- a/pkgs/by-name/lx/lxcfs/package.nix +++ b/pkgs/by-name/lx/lxcfs/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { help2man makeWrapper ninja - (python3.withPackages (p: [ p.jinja2 ])) + (python3.pythonOnBuildForHost.withPackages (p: [ p.jinja2 ])) pkg-config ]; buildInputs = [ fuse3 ]; From 0315d183b8e21607cedfe62515fa746268cb32f7 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 19 Dec 2024 21:07:46 -0500 Subject: [PATCH 081/146] libdeltachat: fix cross compilation --- pkgs/by-name/li/libdeltachat/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index 296ca86cd9e37..35570145956f4 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -72,6 +72,11 @@ stdenv.mkDerivation rec { --replace __FILE__ '"${placeholder "out"}/include/deltachat.h"' ''; + env = { + CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTarget; + CARGO_BUILD_RUSTFLAGS = "-C linker=${stdenv.cc.targetPrefix}cc"; + }; + passthru = { tests = { inherit deltachat-desktop deltachat-repl deltachat-rpc-server; From 4a7b4fe211af9810df3bc54ca6feb7ff6bfd0058 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 02:27:35 +0000 Subject: [PATCH 082/146] fedimint: 0.4.4 -> 0.5.0 --- pkgs/by-name/fe/fedimint/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fe/fedimint/package.nix b/pkgs/by-name/fe/fedimint/package.nix index 0260bb78d289d..af1db2d92aec0 100644 --- a/pkgs/by-name/fe/fedimint/package.nix +++ b/pkgs/by-name/fe/fedimint/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "fedimint"; - version = "0.4.4"; + version = "0.5.0"; src = fetchFromGitHub { owner = "fedimint"; repo = "fedimint"; rev = "v${version}"; - hash = "sha256-YyvppmKs6RCIzmn9bezNxjoCSlPY6GCWmy+bsSbCA2A="; + hash = "sha256-0MM5xpxBam95vSepDvVtpt/997XyC8aOqDiyPykHRRc="; }; - cargoHash = "sha256-nWwAmthTOzKDLrHN0v/usC8DfmHzywNJs/6xdyCBBZY="; + cargoHash = "sha256-y0vD4LrFv9bclCuA1xiFciO+lNY/MFw4aMk4/0USibA="; nativeBuildInputs = [ protobuf From e8c67e70a0cb745243ff750a07619c2e3e0862ac Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 20 Dec 2024 03:57:26 +0100 Subject: [PATCH 083/146] bottles: 51.15 -> 51.17 --- pkgs/by-name/bo/bottles-unwrapped/package.nix | 23 ++++++++-- .../remove-flatpak-check.patch | 17 ++++++++ .../remove-unsupported-warning.patch | 40 ++++++++++++++++++ .../bottles-unwrapped/warn-unsupported.patch | 42 +++++++++++++++++++ pkgs/by-name/bo/bottles/package.nix | 3 +- 5 files changed, 120 insertions(+), 5 deletions(-) create mode 100644 pkgs/by-name/bo/bottles-unwrapped/remove-flatpak-check.patch create mode 100644 pkgs/by-name/bo/bottles-unwrapped/remove-unsupported-warning.patch create mode 100644 pkgs/by-name/bo/bottles-unwrapped/warn-unsupported.patch diff --git a/pkgs/by-name/bo/bottles-unwrapped/package.nix b/pkgs/by-name/bo/bottles-unwrapped/package.nix index c6aa927e1c020..c1ac158369390 100644 --- a/pkgs/by-name/bo/bottles-unwrapped/package.nix +++ b/pkgs/by-name/bo/bottles-unwrapped/package.nix @@ -24,21 +24,35 @@ mangohud, vkbasalt-cli, vmtouch, + libportal, nix-update-script, + removeWarningPopup ? false, # Final reminder to report any issues on nixpkgs' bugtracker }: python3Packages.buildPythonApplication rec { pname = "bottles-unwrapped"; - version = "51.15"; + version = "51.17"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = "bottles"; - rev = "refs/tags/${version}"; - hash = "sha256-HjGAeIh9s7xWBy35Oj66tCtgKCd/DpHg1sMPsdjWKDs="; + tag = version; + hash = "sha256-m4ATWpAZxIBp1X0cNeyNGmt6aIBo/cHH+DpOMkLia0E="; }; - patches = [ ./vulkan_icd.patch ]; + patches = + [ + ./vulkan_icd.patch + ./remove-flatpak-check.patch + ] + ++ ( + if removeWarningPopup then + [ ./remove-unsupported-warning.patch ] + else + [ + ./warn-unsupported.patch + ] + ); # https://github.com/bottlesdevs/Bottles/wiki/Packaging nativeBuildInputs = [ @@ -57,6 +71,7 @@ python3Packages.buildPythonApplication rec { gtk4 gtksourceview5 libadwaita + libportal ]; propagatedBuildInputs = diff --git a/pkgs/by-name/bo/bottles-unwrapped/remove-flatpak-check.patch b/pkgs/by-name/bo/bottles-unwrapped/remove-flatpak-check.patch new file mode 100644 index 0000000000000..ddce9a0df8eec --- /dev/null +++ b/pkgs/by-name/bo/bottles-unwrapped/remove-flatpak-check.patch @@ -0,0 +1,17 @@ +diff --git a/bottles/frontend/meson.build b/bottles/frontend/meson.build +index 6ff7c011..c26ea0b9 100644 +--- a/bottles/frontend/meson.build ++++ b/bottles/frontend/meson.build +@@ -23,12 +23,6 @@ params_file = configure_file( + configuration: conf + ) + +-fs = import('fs') +- +-if not fs.is_file('/' + '.flatpak-info') +- error('file does not exist') +-endif +- + bottles_sources = [ + '__init__.py', + 'main.py', diff --git a/pkgs/by-name/bo/bottles-unwrapped/remove-unsupported-warning.patch b/pkgs/by-name/bo/bottles-unwrapped/remove-unsupported-warning.patch new file mode 100644 index 0000000000000..ed0ba631d3a7a --- /dev/null +++ b/pkgs/by-name/bo/bottles-unwrapped/remove-unsupported-warning.patch @@ -0,0 +1,40 @@ +diff --git a/bottles/frontend/windows/main_window.py b/bottles/frontend/windows/main_window.py +index 79bf0d72..e37ca43e 100644 +--- a/bottles/frontend/windows/main_window.py +index 79bf0d72..e37ca43e 100644 +--- a/bottles/frontend/windows/main_window.py ++++ b/bottles/frontend/windows/main_window.py +@@ -104,29 +104,15 @@ class MainWindow(Adw.ApplicationWindow): + + def response(dialog, response, *args): + if response == "close": +- quit(1) ++ return + +- body = _( +- "Bottles is only supported within a sandboxed environment. Official sources of Bottles are available at" +- ) +- download_url = "usebottles.com/download" +- +- error_dialog = Adw.AlertDialog.new( +- _("Unsupported Environment"), +- f"{body} {download_url}.", +- ) +- +- error_dialog.add_response("close", _("Close")) +- error_dialog.set_body_use_markup(True) +- error_dialog.connect("response", response) +- error_dialog.present(self) +- logging.error( ++ logging.warn( + _( + "Bottles is only supported within a sandboxed format. Official sources of Bottles are available at:" + ) + ) +- logging.error("https://usebottles.com/download/") +- return ++ logging.warn("https://usebottles.com/download/") ++ logging.warn("Please report any issues at: https://github.com/NixOS/nixpkgs/issues") + + # Loading view + self.page_loading = LoadingView() diff --git a/pkgs/by-name/bo/bottles-unwrapped/warn-unsupported.patch b/pkgs/by-name/bo/bottles-unwrapped/warn-unsupported.patch new file mode 100644 index 0000000000000..192986ae725d0 --- /dev/null +++ b/pkgs/by-name/bo/bottles-unwrapped/warn-unsupported.patch @@ -0,0 +1,42 @@ +diff --git a/bottles/frontend/windows/main_window.py b/bottles/frontend/windows/main_window.py +index 79bf0d72..e3a15cb5 100644 +--- a/bottles/frontend/windows/main_window.py ++++ b/bottles/frontend/windows/main_window.py +@@ -104,29 +104,29 @@ class MainWindow(Adw.ApplicationWindow): + + def response(dialog, response, *args): + if response == "close": +- quit(1) ++ return + + body = _( +- "Bottles is only supported within a sandboxed environment. Official sources of Bottles are available at" ++ "Bottles is only supported within a sandboxed environment. Please report any issues at:" + ) +- download_url = "usebottles.com/download" ++ bugtracker_url = "github.com/NixOS/nixpkgs/issues" + + error_dialog = Adw.AlertDialog.new( + _("Unsupported Environment"), +- f"{body} {download_url}.", ++ f"{body} {bugtracker_url}.", + ) + +- error_dialog.add_response("close", _("Close")) ++ error_dialog.add_response("close", _("Understood")) + error_dialog.set_body_use_markup(True) + error_dialog.connect("response", response) + error_dialog.present(self) +- logging.error( ++ logging.warn( + _( + "Bottles is only supported within a sandboxed format. Official sources of Bottles are available at:" + ) + ) +- logging.error("https://usebottles.com/download/") +- return ++ logging.warn("https://usebottles.com/download/") ++ logging.warn("Please report any issues at: https://github.com/NixOS/nixpkgs/issues") + + # Loading view + self.page_loading = LoadingView() diff --git a/pkgs/by-name/bo/bottles/package.nix b/pkgs/by-name/bo/bottles/package.nix index d9a4543ebde29..26e448ddffbcc 100644 --- a/pkgs/by-name/bo/bottles/package.nix +++ b/pkgs/by-name/bo/bottles/package.nix @@ -4,6 +4,7 @@ bottles-unwrapped, extraPkgs ? pkgs: [ ], extraLibraries ? pkgs: [ ], + removeWarningPopup ? false, }: let @@ -16,7 +17,7 @@ let pkgs: with pkgs; [ - bottles-unwrapped + (bottles-unwrapped.override { inherit removeWarningPopup; }) # This only allows to enable the toggle, vkBasalt won't work if not installed with environment.systemPackages (or nix-env) # See https://github.com/bottlesdevs/Bottles/issues/2401 vkbasalt From 34eefd783b63bff9c299b49c6baf8522c7b215ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 03:09:56 +0000 Subject: [PATCH 084/146] k6: 0.55.0 -> 0.55.1 --- pkgs/by-name/k6/k6/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/k6/k6/package.nix b/pkgs/by-name/k6/k6/package.nix index 12057e640e354..6cc6563f41c6c 100644 --- a/pkgs/by-name/k6/k6/package.nix +++ b/pkgs/by-name/k6/k6/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "k6"; - version = "0.55.0"; + version = "0.55.1"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - hash = "sha256-SWmKtnpG/MvSGllZSv3EJjVjOVUWcWFVLqz/FcvEl9Y="; + hash = "sha256-29lb8vCMe6BcGeSlfMQm3w+UsD9n3FCljRiT51QNiLU="; }; subPackages = [ "./" ]; From aa0d4a80e8bbf4a8267fb2094d9e1dc64a37e290 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 05:05:54 +0000 Subject: [PATCH 085/146] terraform-providers.project: 1.9.1 -> 1.9.3 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8e6baa0f8df02..ae00620912135 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1021,13 +1021,13 @@ "vendorHash": null }, "project": { - "hash": "sha256-hhBs++NEKNk6W9Vay72ywzTkjeQfVADGaHn6jhoaCp0=", + "hash": "sha256-cDq77FvYOSRXcm8haec4LvnnUptgcj7gdc1/ohFuD3g=", "homepage": "https://registry.terraform.io/providers/jfrog/project", "owner": "jfrog", "repo": "terraform-provider-project", - "rev": "v1.9.1", + "rev": "v1.9.3", "spdx": "Apache-2.0", - "vendorHash": "sha256-/W07Lx/bgBkNJKXwGwuCMweTF3/DVRdvUV2R0WMbGLo=" + "vendorHash": "sha256-mnKXYT0GfIS+ODzBCS9l4rLF1ugadesmpgdOgj74nLg=" }, "proxmox": { "hash": "sha256-ikXLLNoAjrnGGGI3fHTKFXm8YwqNazE/U39JTjOBsW4=", From e6c5ed302a0e501d931c69a899f95f03f9f40139 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 05:33:08 +0000 Subject: [PATCH 086/146] terraform-providers.pagerduty: 3.18.1 -> 3.18.2 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8e6baa0f8df02..e74ac6251bfd7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -976,11 +976,11 @@ "vendorHash": null }, "pagerduty": { - "hash": "sha256-q23rVU224nOQefn3QZW63YYkBFKjFIj1xYoYBMs48og=", + "hash": "sha256-HJ2HXH2HKY1nPRVQ/UPyMwm7++H0KR9iunNNEtkttm4=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v3.18.1", + "rev": "v3.18.2", "spdx": "MPL-2.0", "vendorHash": null }, From ff2faa439409a2fc632267e410758868be96ab7b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 05:43:39 +0000 Subject: [PATCH 087/146] hyprlandPlugins.hypr-dynamic-cursors: 0-unstable-2024-12-14 -> 0-unstable-2024-12-19 --- .../hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix index dc78919bf92ab..9ca164b1887c9 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix @@ -8,13 +8,13 @@ mkHyprlandPlugin hyprland { pluginName = "hypr-dynamic-cursors"; - version = "0-unstable-2024-12-14"; + version = "0-unstable-2024-12-19"; src = fetchFromGitHub { owner = "VirtCode"; repo = "hypr-dynamic-cursors"; - rev = "f0cef070c531e3a3a1f713b7062bded357b4c468"; - hash = "sha256-XFQqJWxo6xUqLpAKqc0bHg1pZ21eFQ1HueDTxw7N6r8="; + rev = "111669a699f998b5eb5a0d5610b5fcb748aab038"; + hash = "sha256-EeNVNDNxbz1dGWs/jJ/JQbZtWkN+i4qfU7SAiQOMwwY="; }; dontUseCmakeConfigure = true; From 1dd3a4966ddaa02d1e76a91100d3831ceccb0d48 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 06:25:17 +0000 Subject: [PATCH 088/146] simplotask: 1.16.1 -> 1.16.2 --- pkgs/by-name/si/simplotask/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simplotask/package.nix b/pkgs/by-name/si/simplotask/package.nix index ac0c46cc9361d..18a5919a5020c 100644 --- a/pkgs/by-name/si/simplotask/package.nix +++ b/pkgs/by-name/si/simplotask/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "simplotask"; - version = "1.16.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "umputun"; repo = "spot"; rev = "v${version}"; - hash = "sha256-SfHemtGomn1zxK4oQMYXfzAftmMd5yroY+mFaxtq6HE="; + hash = "sha256-D5XQeY8y9Bof5AWAR5Wt6anOT6RFG887H5lwxvx02E8="; }; vendorHash = null; From 0529551e13d5a3094d79dc44b2785f650b7f134a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 20 Dec 2024 07:47:12 +0100 Subject: [PATCH 089/146] python312Packages.tencentcloud-sdk-python: 3.0.1285 -> 3.0.1286 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1285...3.0.1286 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1286/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 307455fb8c73c..3659261515043 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.1285"; + version = "3.0.1286"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-tWN2FgL7PDoxvmX3lU/TQCmE51fZ7FBH0oM2VXMlfnw="; + hash = "sha256-tSwg9Bu1ist6A+uS6lvY3bUtilXrwqYryIN4LbLMHvU="; }; build-system = [ setuptools ]; From 83c0baf7ebd03305d244d1adbf24e67e4c103d8d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 06:55:17 +0000 Subject: [PATCH 090/146] ginkgo: 2.22.0 -> 2.22.1 --- pkgs/by-name/gi/ginkgo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/ginkgo/package.nix b/pkgs/by-name/gi/ginkgo/package.nix index e80d7d013673e..a144aa2274445 100644 --- a/pkgs/by-name/gi/ginkgo/package.nix +++ b/pkgs/by-name/gi/ginkgo/package.nix @@ -8,15 +8,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.22.0"; + version = "2.22.1"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-yGoWIPsOHabYAenGEzLkJ1HpSP4bkFwFhWv6cTIkitY="; + sha256 = "sha256-/AE3LSwX6Cl3Nsa8zUz3ncvuiu+7S4kNRFocQZn1BHs="; }; - vendorHash = "sha256-tjHBnkFlkP7n0/c9bz/nUzWerPzVQ+12cKijG1Jzti8="; + vendorHash = "sha256-860KUrUc+YJv3xANdR1mT9loZErlCfwYBb6HUxoehMc="; # integration tests expect more file changes # types tests are missing CodeLocation From 7190b523e2bef39dc2b041375ca6176dc7803715 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 20 Dec 2024 08:11:54 +0100 Subject: [PATCH 091/146] checkov: 3.2.342 -> 3.2.343 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.342...3.2.343 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.343 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index de190f76127e3..f309fb1e10afc 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.342"; + version = "3.2.343"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-/Cl+n4ctOTGnF/wMZ2a2yBaYpeYhh03I5LO1WGGnqYc="; + hash = "sha256-PTwJlkj4gDZQPF12C2vP0uYZ0RYymfHIWHaWcJsDKW8="; }; patches = [ ./flake8-compat-5.x.patch ]; From 992b3ae6bfddd29401c51037c75ffaec0c910d11 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 20 Dec 2024 10:25:29 +0300 Subject: [PATCH 092/146] linux_6_12: 6.12.5 -> 6.12.6 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 39c0790a9ee4a..4a9ee748c524d 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -28,7 +28,7 @@ "hash": "sha256:1z2913y38clnlmhvwj49h7p4pic24s4d8np7nmd4lk7m2xz8w532" }, "6.12": { - "version": "6.12.5", - "hash": "sha256:1k9bc0lpgg29bh7zqz3pm91hhjnfyl5aw6r6hph3ha743k77y81r" + "version": "6.12.6", + "hash": "sha256:17lwn89903ffyi2b29j59c1gsczsc1kj3x70hnxziqg4blhsnl6l" } } From 61a720f53e16bfda2afa863e0dcdf7b31a4602ac Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 20 Dec 2024 10:25:33 +0300 Subject: [PATCH 093/146] linux_6_6: 6.6.66 -> 6.6.67 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 4a9ee748c524d..8da3043059140 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "hash": "sha256:082bq26bwi8jxfbk840wf9awm5l65aya4bg43im9qvqfpzjzl3qd" }, "6.6": { - "version": "6.6.66", - "hash": "sha256:0lhy5waj330hmaxbqpfw2fxzkvvlxxs1nr325i8jy736qhvpjxcx" + "version": "6.6.67", + "hash": "sha256:06iy243l7c2nldamq0nzbkwxrqr7sg0p89gdp3ib18s2xj1a87g4" }, "6.11": { "version": "6.11.11", From 2d84ed11e90186b5c5c363559a4460493dc8a979 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 20 Dec 2024 10:25:39 +0300 Subject: [PATCH 094/146] linux_6_1: 6.1.120 -> 6.1.121 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 8da3043059140..a6dd0ba9528f3 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:1jls6qnzzjmxr2svva3vky5a4p7jslxkjdgrh9v3ivhk3sb6n9kw" }, "6.1": { - "version": "6.1.120", - "hash": "sha256:06gp5fdq0bc39hd8mf9mrdrygdybdr3nzsb58lcapf5vmjw9gjb1" + "version": "6.1.121", + "hash": "sha256:0hrv9l2m4yqhh6cwr8xj9jvx8y3sfwmd394g0f2iawrgc3d1dg6x" }, "5.15": { "version": "5.15.174", From c41d83bd8f954f2e84aef4bc385c1a09ecdd208f Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 20 Dec 2024 10:25:42 +0300 Subject: [PATCH 095/146] linux_5_15: 5.15.174 -> 5.15.175 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index a6dd0ba9528f3..d59052e1ae6fd 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -8,8 +8,8 @@ "hash": "sha256:0hrv9l2m4yqhh6cwr8xj9jvx8y3sfwmd394g0f2iawrgc3d1dg6x" }, "5.15": { - "version": "5.15.174", - "hash": "sha256:02kn9nvaa36s070k235lk9x6n40l2zlwj4v6i2y6nnx0cjw3rrn3" + "version": "5.15.175", + "hash": "sha256:1l59x1f1b29mayhzxxkh9vlba41h51mmfh1vram31bks1v4bpn4g" }, "5.10": { "version": "5.10.231", From a8ce8341dd3863dcf9a3efa01dc2f5cd88c73b83 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 20 Dec 2024 10:25:46 +0300 Subject: [PATCH 096/146] linux_5_10: 5.10.231 -> 5.10.232 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index d59052e1ae6fd..a3b63204b8243 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -12,8 +12,8 @@ "hash": "sha256:1l59x1f1b29mayhzxxkh9vlba41h51mmfh1vram31bks1v4bpn4g" }, "5.10": { - "version": "5.10.231", - "hash": "sha256:0xcnlz5ib4b368z5cyp4qwys3jsbm18wlvwn73rzj2j6rj1lhnjn" + "version": "5.10.232", + "hash": "sha256:1w5ycdh24j4gsjc2zk7nhbmya59vhi49lbh8333ziprqlj4lb97x" }, "5.4": { "version": "5.4.287", From d1f97900eb606269d72812534e8269265b553020 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 20 Dec 2024 10:25:53 +0300 Subject: [PATCH 097/146] linux_5_4: 5.4.287 -> 5.4.288 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index a3b63204b8243..bf5743e91f441 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -16,8 +16,8 @@ "hash": "sha256:1w5ycdh24j4gsjc2zk7nhbmya59vhi49lbh8333ziprqlj4lb97x" }, "5.4": { - "version": "5.4.287", - "hash": "sha256:082bq26bwi8jxfbk840wf9awm5l65aya4bg43im9qvqfpzjzl3qd" + "version": "5.4.288", + "hash": "sha256:1zhsb6gwhb6cvijzh7s8rnm4b06klyhb2mxb06gcyfvj0givlvw7" }, "6.6": { "version": "6.6.67", From abdd8a2842a4bfb9d621d593115032227b64cbb8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 08:10:02 +0000 Subject: [PATCH 098/146] rustus: 0.7.6-unstable-2024-05-10 -> 1.0.0 --- pkgs/by-name/ru/rustus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ru/rustus/package.nix b/pkgs/by-name/ru/rustus/package.nix index b1588cde67a7b..7ecbdb9f8e07f 100644 --- a/pkgs/by-name/ru/rustus/package.nix +++ b/pkgs/by-name/ru/rustus/package.nix @@ -11,7 +11,7 @@ let pname = "rustus"; - version = "0.7.6-unstable-2024-05-10"; + version = "1.0.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage { hash = "sha256-S3hq6G78HRQVLJuuwfC6U7NQXMSdllrC/ZolVPZRTsA="; }; - cargoHash = "sha256-uN0nXI15LxtSQpUCOJ8QIdgw2OyQO3i5alTik/fI8GI="; + cargoHash = "sha256-yFYDSgfNbm4a9oMG/ZeENhYTfpMxKH7TmPImFlBWwJ8="; env.OPENSSL_NO_VENDOR = 1; From 685d98a18809ac4df387c144fca3c050179bdc4f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 08:40:42 +0000 Subject: [PATCH 099/146] libretro.stella: 7.0-unstable-2024-12-09 -> 7.0-unstable-2024-12-18 --- pkgs/applications/emulators/libretro/cores/stella.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/applications/emulators/libretro/cores/stella.nix index 8c06be0d9b0f8..29fe66e82530e 100644 --- a/pkgs/applications/emulators/libretro/cores/stella.nix +++ b/pkgs/applications/emulators/libretro/cores/stella.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "stella"; - version = "7.0-unstable-2024-12-09"; + version = "7.0-unstable-2024-12-18"; src = fetchFromGitHub { owner = "stella-emu"; repo = "stella"; - rev = "91417312f1a756a1dac88d1df1cecc7362ff7a44"; - hash = "sha256-e8b9kCsa5FxyMExqppCX1jE0YmK1T1n8fORBBSvyE54="; + rev = "dacf66131c938635a7017de364ba999ebbb35bb7"; + hash = "sha256-X6haV9SKQn2lnWs5kcNePP9wfz3G3yq/rEIGiPiBTOY="; }; makefile = "Makefile"; From d52f5eee8087855bd45b12c0ec1c235f6d84cc70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 08:45:59 +0000 Subject: [PATCH 100/146] doppler: 3.70.0 -> 3.71.0 --- pkgs/by-name/do/doppler/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/doppler/package.nix b/pkgs/by-name/do/doppler/package.nix index 2c64639e4db3d..cb5849894a3d6 100644 --- a/pkgs/by-name/do/doppler/package.nix +++ b/pkgs/by-name/do/doppler/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.70.0"; + version = "3.71.0"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - hash = "sha256-uf0CTeM746d1xUTesDfNEKTTsTxvwh/qUicVIfM3uhI="; + hash = "sha256-yN+nMHBjXM78ie7DJn7x5litpYOwSaFse2Ewy1ssjDI="; }; vendorHash = "sha256-NUHWKPszQH/pvnA+j65+bJ6t+C0FDRRbTviqkYztpE4="; From 3275a6b3613c387d99cf2978a4a68a8af69bed11 Mon Sep 17 00:00:00 2001 From: Adam Dinwoodie Date: Fri, 20 Dec 2024 10:55:08 +0000 Subject: [PATCH 101/146] nixos/nix-remote-build: correct comment This module potentially generates `/etc/nix/machines`. Correct an existing comment to refer to that path rather than `/etc/machines`. --- nixos/modules/config/nix-remote-build.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/nix-remote-build.nix b/nixos/modules/config/nix-remote-build.nix index 11fcec30ff640..4786fef31d065 100644 --- a/nixos/modules/config/nix-remote-build.nix +++ b/nixos/modules/config/nix-remote-build.nix @@ -225,7 +225,7 @@ in }; }; - # distributedBuilds does *not* inhibit /etc/machines generation; caller may + # distributedBuilds does *not* inhibit /etc/nix/machines generation; caller may # override that nix option. config = mkIf cfg.enable { assertions = From f6c73e51213167b32ab65b7983842fe2107073b7 Mon Sep 17 00:00:00 2001 From: implr Date: Thu, 19 Dec 2024 23:55:09 +0100 Subject: [PATCH 102/146] solana-validator: drop This is outdated (1.17 will not work on mainnet now) and largely redundant with pkgs/by-name/so/solana-cli/package.nix. That package already builds all the validator binaries. --- .../blockchains/solana-validator/Cargo.lock | 9147 ----------------- .../blockchains/solana-validator/default.nix | 131 - .../blockchains/solana-validator/pin.json | 4 - .../blockchains/solana-validator/update.sh | 33 - pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 6 files changed, 1 insertion(+), 9317 deletions(-) delete mode 100644 pkgs/applications/blockchains/solana-validator/Cargo.lock delete mode 100644 pkgs/applications/blockchains/solana-validator/default.nix delete mode 100644 pkgs/applications/blockchains/solana-validator/pin.json delete mode 100755 pkgs/applications/blockchains/solana-validator/update.sh diff --git a/pkgs/applications/blockchains/solana-validator/Cargo.lock b/pkgs/applications/blockchains/solana-validator/Cargo.lock deleted file mode 100644 index 984d2e3828bfb..0000000000000 --- a/pkgs/applications/blockchains/solana-validator/Cargo.lock +++ /dev/null @@ -1,9147 +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.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.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" -dependencies = [ - "generic-array 0.14.7", -] - -[[package]] -name = "aes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" -dependencies = [ - "cfg-if 1.0.0", - "cipher", - "cpufeatures", - "opaque-debug 0.3.0", -] - -[[package]] -name = "aes-gcm-siv" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589c637f0e68c877bbd59a4599bbe849cac8e5f3e4b5a3ebae8f528cd218dcdc" -dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "polyval", - "subtle", - "zeroize", -] - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom 0.2.10", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d" -dependencies = [ - "cfg-if 1.0.0", - "getrandom 0.2.10", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "0.7.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" -dependencies = [ - "memchr", -] - -[[package]] -name = "aho-corasick" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" -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.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 = "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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ed72e1635e121ca3e79420540282af22da58be50de153d36f81ddc6b83aa9e" -dependencies = [ - "libc", -] - -[[package]] -name = "anes" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" - -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "anstyle" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" - -[[package]] -name = "anyhow" -version = "1.0.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" - -[[package]] -name = "arc-swap" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5d78ce20460b82d3fa150275ed9d55e21064fc7951177baacf86a145c4a4b1f" - -[[package]] -name = "ark-bn254" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a22f4561524cd949590d78d7d4c5df8f592430d221f7f3c9497bbafd8972120f" -dependencies = [ - "ark-ec", - "ark-ff", - "ark-std", -] - -[[package]] -name = "ark-ec" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" -dependencies = [ - "ark-ff", - "ark-poly", - "ark-serialize", - "ark-std", - "derivative", - "hashbrown 0.13.2", - "itertools", - "num-traits", - "zeroize", -] - -[[package]] -name = "ark-ff" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" -dependencies = [ - "ark-ff-asm", - "ark-ff-macros", - "ark-serialize", - "ark-std", - "derivative", - "digest 0.10.7", - "itertools", - "num-bigint 0.4.4", - "num-traits", - "paste", - "rustc_version 0.4.0", - "zeroize", -] - -[[package]] -name = "ark-ff-asm" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "ark-ff-macros" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" -dependencies = [ - "num-bigint 0.4.4", - "num-traits", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "ark-poly" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" -dependencies = [ - "ark-ff", - "ark-serialize", - "ark-std", - "derivative", - "hashbrown 0.13.2", -] - -[[package]] -name = "ark-serialize" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" -dependencies = [ - "ark-serialize-derive", - "ark-std", - "digest 0.10.7", - "num-bigint 0.4.4", -] - -[[package]] -name = "ark-serialize-derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "ark-std" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" -dependencies = [ - "num-traits", - "rand 0.8.5", -] - -[[package]] -name = "array-bytes" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ad284aeb45c13f2fb4f084de4a420ebf447423bdf9386c0540ce33cb3ef4b8c" - -[[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 = "ascii" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" - -[[package]] -name = "asn1-rs" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf6690c370453db30743b373a60ba498fc0d6d83b11f4abfd87a84a075db5dd4" -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 = "assert_cmd" -version = "2.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9834fcc22e0874394a010230586367d4a3e9f11b560f469262678547e1d2575e" -dependencies = [ - "bstr 1.4.0", - "doc-comment", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", -] - -[[package]] -name = "assert_matches" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" - -[[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", - "futures-core", -] - -[[package]] -name = "async-compression" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b74f44609f0f91493e3082d3734d98497e094777144380ea4db9f9905dd5b6" -dependencies = [ - "brotli", - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "async-mutex" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-stream" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171374e7e3b2504e0e5236e3b59260560f9fe94bfe9ac39ba5e4e929c5590625" -dependencies = [ - "async-stream-impl", - "futures-core", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "648ed8c8d2ce5409ccd57453d9d1b214b342a0d69376a6feda1fd6cae3299308" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "async-trait" -version = "0.1.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[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 0.3.9", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "autotools" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8138adefca3e5d2e73bfba83bd6eeaf904b26a7ac1b4a19892cfe16cc7e1701" -dependencies = [ - "cc", -] - -[[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 2.3.0", - "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 = "backoff" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" -dependencies = [ - "futures-core", - "getrandom 0.2.10", - "instant", - "pin-project-lite", - "rand 0.8.5", - "tokio", -] - -[[package]] -name = "backtrace" -version = "0.3.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" -dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - -[[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 = "base64ct" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "874f8444adcb4952a8bc51305c8be95c8ec8237bb0d2e78d2e039f771f8828a0" - -[[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.65.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" -dependencies = [ - "bitflags 1.3.2", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "prettyplease 0.2.4", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.38", -] - -[[package]] -name = "bit-set" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de" -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.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" -dependencies = [ - "serde", -] - -[[package]] -name = "bitmaps" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" -dependencies = [ - "typenum", -] - -[[package]] -name = "blake3" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" -dependencies = [ - "arrayref", - "arrayvec", - "cc", - "cfg-if 1.0.0", - "constant_time_eq", - "digest 0.10.7", -] - -[[package]] -name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding 0.1.5", - "byte-tools", - "byteorder", - "generic-array 0.12.4", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "block-padding 0.2.1", - "generic-array 0.14.7", -] - -[[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 = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - -[[package]] -name = "block-padding" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" - -[[package]] -name = "borsh" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15bf3650200d8bffa99015595e10f1fbd17de07abbc25bb067da79e769939bfa" -dependencies = [ - "borsh-derive 0.9.3", - "hashbrown 0.11.2", -] - -[[package]] -name = "borsh" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" -dependencies = [ - "borsh-derive 0.10.3", - "hashbrown 0.12.3", -] - -[[package]] -name = "borsh-derive" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6441c552f230375d18e3cc377677914d2ca2b0d36e52129fe15450a2dce46775" -dependencies = [ - "borsh-derive-internal 0.9.3", - "borsh-schema-derive-internal 0.9.3", - "proc-macro-crate 0.1.5", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "borsh-derive" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" -dependencies = [ - "borsh-derive-internal 0.10.3", - "borsh-schema-derive-internal 0.10.3", - "proc-macro-crate 0.1.5", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "borsh-derive-internal" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "borsh-derive-internal" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "borsh-schema-derive-internal" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "borsh-schema-derive-internal" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "brotli" -version = "3.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" -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 = "bs58" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" - -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "memchr", -] - -[[package]] -name = "bstr" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" -dependencies = [ - "memchr", - "once_cell", - "regex-automata 0.1.10", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" - -[[package]] -name = "bv" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8834bb1d8ee5dc048ee3124f2c7c1afcc6bc9aed03f11e9dfd8c69470a5db340" -dependencies = [ - "feature-probe", - "serde", -] - -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - -[[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 = "bytecount" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad152d03a2c813c80bb94fedbf3a3f02b28f793e39e7c214c8a0bcc196343de7" - -[[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.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aca418a974d83d40a0c1f0c5cba6ff4bc28d8df099109ca459a2118d40b6322" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[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 = "bytesize" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c58ec36aac5066d5ca17df51b3e70279f5670a72102f5752cb7e7c856adfc70" - -[[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 = "camino" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "869119e97797867fd90f5e22af7d0bd274bd4635ebb9eb68c04f3f513ae6c412" -dependencies = [ - "serde", -] - -[[package]] -name = "caps" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190baaad529bcfbde9e1a19022c42781bdb6ff9de25721abdb8fd98c0807730b" -dependencies = [ - "libc", - "thiserror", -] - -[[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 1.0.20", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "cast" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a" -dependencies = [ - "rustc_version 0.4.0", -] - -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - -[[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-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.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.48.0", -] - -[[package]] -name = "chrono-humanize" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799627e6b4d27827a814e837b9d8a504832086081806d45b1afa34dc982b023b" -dependencies = [ - "chrono", -] - -[[package]] -name = "ciborium" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" - -[[package]] -name = "ciborium-ll" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" -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 0.14.7", -] - -[[package]] -name = "clang-sys" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10612c0ec0e0a1ff0e97980647cb058a6e7aedb913d01d009c406b8b7d0b26ee" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "clap" -version = "2.33.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" -dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim 0.8.0", - "textwrap 0.11.0", - "unicode-width", - "vec_map", -] - -[[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", - "clap_lex 0.2.4", - "indexmap 1.9.3", - "once_cell", - "strsim 0.10.0", - "termcolor", - "textwrap 0.16.0", -] - -[[package]] -name = "clap" -version = "4.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd" -dependencies = [ - "clap_builder", -] - -[[package]] -name = "clap_builder" -version = "4.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa" -dependencies = [ - "anstyle", - "clap_lex 0.5.0", -] - -[[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_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.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" - -[[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 = "concurrent-queue" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "console" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.45.0", -] - -[[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 1.0.0", - "wasm-bindgen", -] - -[[package]] -name = "console_log" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89f72f65e8501878b8a004d5a1afb780987e2ce2b4532c562e367a72c57499f" -dependencies = [ - "log", - "web-sys", -] - -[[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.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" -dependencies = [ - "const_format_proc_macros", -] - -[[package]] -name = "const_format_proc_macros" -version = "0.2.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[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.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "core-foundation" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "core_affinity" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f8a03115cc34fb0d7c321dd154a3914b3ca082ccc5c11d91bf7117dbbe7171f" -dependencies = [ - "kernel32-sys", - "libc", - "num_cpus", - "winapi 0.2.8", -] - -[[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.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "criterion" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" -dependencies = [ - "anes", - "cast 0.3.0", - "ciborium", - "clap 4.3.21", - "criterion-plot", - "is-terminal", - "itertools", - "num-traits", - "once_cell", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" -dependencies = [ - "cast 0.3.0", - "itertools", -] - -[[package]] -name = "criterion-stats" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387df94cb74ada1b33e10ce034bb0d9360cc73edb5063e7d7d4120a40ee1c9d2" -dependencies = [ - "cast 0.2.7", - "num-traits", - "num_cpus", - "rand 0.4.6", - "thread-scoped", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.5" -source = "git+https://github.com/solana-labs/crossbeam?rev=fd279d707025f0e60951e429bf778b4813d1b6bf#fd279d707025f0e60951e429bf778b4813d1b6bf" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", - "lazy_static", - "memoffset 0.6.4", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" -dependencies = [ - "cfg-if 1.0.0", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" -dependencies = [ - "generic-array 0.14.7", - "typenum", -] - -[[package]] -name = "crypto-mac" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" -dependencies = [ - "generic-array 0.14.7", - "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 = "ctr" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" -dependencies = [ - "cipher", -] - -[[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 0.48.0", -] - -[[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 = "darling" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 2.0.38", -] - -[[package]] -name = "darling_macro" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -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", -] - -[[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.1", - "lock_api", - "once_cell", - "parking_lot_core 0.9.8", -] - -[[package]] -name = "data-encoding" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" - -[[package]] -name = "der" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" -dependencies = [ - "const-oid", -] - -[[package]] -name = "der-parser" -version = "8.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d4bc9b0db0a0df9ae64634ac5bdefb7afcb534e182275ca0beadbe486701c1" -dependencies = [ - "asn1-rs", - "displaydoc", - "nom", - "num-bigint 0.4.4", - "num-traits", - "rusticata-macros", -] - -[[package]] -name = "derivation-path" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5c37193a1db1d8ed868c03ec7b152175f26160a5b740e5e484143877e0adf0" - -[[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_more" -version = "0.99.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40eebddd2156ce1bb37b20bbe5151340a31828b1f2d22ba4141f3531710e38df" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version 0.3.3", - "syn 1.0.109", -] - -[[package]] -name = "dialoguer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" -dependencies = [ - "console", - "shell-words", - "tempfile", - "zeroize", -] - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "digest" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -dependencies = [ - "generic-array 0.12.4", -] - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array 0.14.7", -] - -[[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 = "dir-diff" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2860407d7d7e2e004bb2128510ad9e8d669e76fa005ccf567977b5d71b8b4a0b" -dependencies = [ - "walkdir", -] - -[[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 = "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 = "dlopen2" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b4f5f101177ff01b8ec4ecc81eead416a8aa42819a2869311b3420fa114ffa" -dependencies = [ - "dlopen2_derive", - "libc", - "once_cell", - "winapi 0.3.9", -] - -[[package]] -name = "dlopen2_derive" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6cbae11b3de8fce2a456e8ea3dada226b35fe791f0dc1d360c0941f0bb681f3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "eager" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abe71d579d1812060163dff96056261deb5bf6729b100fa2e36a68b9649ba3d3" - -[[package]] -name = "ed25519" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4620d40f6d2601794401d6dd95a5cf69b6c157852539470eeda433a99b3c0efc" -dependencies = [ - "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", - "sha2 0.9.9", - "zeroize", -] - -[[package]] -name = "ed25519-dalek-bip32" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d2be62a4061b872c8c0873ee4fc6f101ce7b889d039f019c5fa2af471a59908" -dependencies = [ - "derivation-path", - "ed25519-dalek", - "hmac 0.12.1", - "sha2 0.10.8", -] - -[[package]] -name = "educe" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f86b50932a01e7ec5c06160492ab660fb19b6bb2a7878030dd6cd68d21df9d4d" -dependencies = [ - "enum-ordinalize", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[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.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "enum-iterator" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7add3873b5dd076766ee79c8e406ad1a472c385476b9e38849f8eec24f1be689" -dependencies = [ - "enum-iterator-derive", -] - -[[package]] -name = "enum-iterator-derive" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "enum-ordinalize" -version = "3.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b166c9e378360dd5a6666a9604bb4f54ae0cac39023ffbac425e917a2a04fef" -dependencies = [ - "num-bigint 0.4.4", - "num-traits", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "equivalent" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" - -[[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 = "etcd-client" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4b0ea5ef6dc2388a4b1669fa32097249bc03a15417b97cb75e38afb309e4a89" -dependencies = [ - "http", - "prost", - "tokio", - "tokio-stream", - "tonic", - "tonic-build", - "tower", - "tower-service", -] - -[[package]] -name = "event-listener" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" - -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - -[[package]] -name = "fast-math" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2465292146cdfc2011350fe3b1c616ac83cf0faeedb33463ba1c332ed8948d66" -dependencies = [ - "ieee754", -] - -[[package]] -name = "fastrand" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" - -[[package]] -name = "fd-lock" -version = "3.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" -dependencies = [ - "cfg-if 1.0.0", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "feature-probe" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da" - -[[package]] -name = "filedescriptor" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed3d8a5e20435ff00469e51a0d82049bae66504b5c429920dadf9bb54d47b3f" -dependencies = [ - "libc", - "thiserror", - "winapi 0.3.9", -] - -[[package]] -name = "filetime" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall 0.2.10", - "winapi 0.3.9", -] - -[[package]] -name = "fixedbitset" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e" - -[[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" -dependencies = [ - "num-traits", -] - -[[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 2.3.0", -] - -[[package]] -name = "fs-err" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" - -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - -[[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.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" - -[[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", - "num_cpus", -] - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[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.38", -] - -[[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 0.1.31", - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "gag" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a713bee13966e9fbffdf7193af71d54a6b35a0bb34997cd6c9519ebeb5005972" -dependencies = [ - "filedescriptor", - "tempfile", -] - -[[package]] -name = "gdbstub" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32c95766e0414f8bfc1d07055574c621b67739466d6ba516c4fef8e99d30d2e6" -dependencies = [ - "bitflags 1.3.2", - "cfg-if 1.0.0", - "log", - "managed", - "num-traits", - "paste", -] - -[[package]] -name = "gen-headers" -version = "1.17.28" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "gen-syscall-list" -version = "1.17.28" -dependencies = [ - "regex", -] - -[[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 = [ - "serde", - "typenum", - "version_check", -] - -[[package]] -name = "gethostname" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "gimli" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" - -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - -[[package]] -name = "globset" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd" -dependencies = [ - "aho-corasick 0.7.18", - "bstr 0.2.17", - "fnv", - "log", - "regex", -] - -[[package]] -name = "goauth" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8af59a261bcf42f45d1b261232847b9b850ba0a1419d6100698246fb66e9240" -dependencies = [ - "arc-swap", - "futures 0.3.28", - "log", - "reqwest", - "serde", - "serde_derive", - "serde_json", - "simpl", - "smpl_jwt", - "time", - "tokio", -] - -[[package]] -name = "goblin" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c955ab4e0ad8c843ea653a3d143048b87490d9be56bd7132a435c2407846ac8f" -dependencies = [ - "log", - "plain", - "scroll", -] - -[[package]] -name = "h2" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap 2.0.2", - "slab", - "tokio", - "tokio-util 0.7.1", - "tracing", -] - -[[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] -name = "hash32" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" -dependencies = [ - "byteorder", -] - -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash 0.7.6", -] - -[[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 = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash 0.8.5", -] - -[[package]] -name = "hashbrown" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" - -[[package]] -name = "headers" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cff78e5788be1e0ab65b04d306b2ed5092c815ec97ec70f4ebd5aee158aa55d" -dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", - "bytes", - "headers-core", - "http", - "httpdate", - "mime", - "sha-1 0.10.0", -] - -[[package]] -name = "headers-core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" -dependencies = [ - "http", -] - -[[package]] -name = "heck" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hidapi" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723777263b0dcc5730aec947496bd8c3940ba63c15f5633b288cc615f4f6af79" -dependencies = [ - "cc", - "libc", - "pkg-config", - "winapi 0.3.9", -] - -[[package]] -name = "histogram" -version = "0.6.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cb882ccb290b8646e554b157ab0b71e64e8d5bef775cd66b6531e52d302669" - -[[package]] -name = "hmac" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840" -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 = "hmac-drbg" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1" -dependencies = [ - "digest 0.9.0", - "generic-array 0.14.7", - "hmac 0.8.1", -] - -[[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.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.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-proxy" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc" -dependencies = [ - "bytes", - "futures 0.3.28", - "headers", - "http", - "hyper", - "hyper-tls", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - -[[package]] -name = "hyper-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" -dependencies = [ - "futures-util", - "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.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad2bfd338099682614d3ee3fe0cd72e0b6a41ca6a87f6a74a3bd593c91650501" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "js-sys", - "wasm-bindgen", - "winapi 0.3.9", -] - -[[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.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -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 = "ieee754" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9007da9cacbd3e6343da136e98b0d2df013f553d35bdec8b518f07bea768e19c" - -[[package]] -name = "im" -version = "15.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9" -dependencies = [ - "bitmaps", - "rand_core 0.6.4", - "rand_xoshiro", - "rayon", - "serde", - "sized-chunks", - "typenum", - "version_check", -] - -[[package]] -name = "index_list" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9d968042a4902e08810946fc7cd5851eb75e80301342305af755ca06cb82ce" - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" -dependencies = [ - "equivalent", - "hashbrown 0.14.1", - "rayon", -] - -[[package]] -name = "indicatif" -version = "0.17.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" -dependencies = [ - "console", - "instant", - "number_prefix", - "portable-atomic", - "unicode-width", -] - -[[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 = "ipnet" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi 0.3.1", - "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.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[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.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "json5" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1" -dependencies = [ - "pest", - "pest_derive", - "serde", -] - -[[package]] -name = "jsonrpc-client-transports" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b99d4207e2a04fb4581746903c2bb7eb376f88de9c699d0f3e10feeac0cd3a" -dependencies = [ - "derive_more", - "futures 0.3.28", - "jsonrpc-core", - "jsonrpc-pubsub", - "jsonrpc-server-utils", - "log", - "parity-tokio-ipc", - "serde", - "serde_json", - "tokio", - "url 1.7.2", -] - -[[package]] -name = "jsonrpc-core" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" -dependencies = [ - "futures 0.3.28", - "futures-executor", - "futures-util", - "log", - "serde", - "serde_derive", - "serde_json", -] - -[[package]] -name = "jsonrpc-core-client" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b51da17abecbdab3e3d4f26b01c5ec075e88d3abe3ab3b05dc9aa69392764ec0" -dependencies = [ - "futures 0.3.28", - "jsonrpc-client-transports", -] - -[[package]] -name = "jsonrpc-derive" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b939a78fa820cdfcb7ee7484466746a7377760970f6f9c6fe19f9edcc8a38d2" -dependencies = [ - "proc-macro-crate 0.1.5", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "jsonrpc-http-server" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1dea6e07251d9ce6a552abfb5d7ad6bc290a4596c8dcc3d795fae2bbdc1f3ff" -dependencies = [ - "futures 0.3.28", - "hyper", - "jsonrpc-core", - "jsonrpc-server-utils", - "log", - "net2", - "parking_lot 0.11.2", - "unicase", -] - -[[package]] -name = "jsonrpc-ipc-server" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382bb0206323ca7cda3dcd7e245cea86d37d02457a02a975e3378fb149a48845" -dependencies = [ - "futures 0.3.28", - "jsonrpc-core", - "jsonrpc-server-utils", - "log", - "parity-tokio-ipc", - "parking_lot 0.11.2", - "tower-service", -] - -[[package]] -name = "jsonrpc-pubsub" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240f87695e6c6f62fb37f05c02c04953cf68d6408b8c1c89de85c7a0125b1011" -dependencies = [ - "futures 0.3.28", - "jsonrpc-core", - "lazy_static", - "log", - "parking_lot 0.11.2", - "rand 0.7.3", - "serde", -] - -[[package]] -name = "jsonrpc-server-utils" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4" -dependencies = [ - "bytes", - "futures 0.3.28", - "globset", - "jsonrpc-core", - "lazy_static", - "log", - "tokio", - "tokio-stream", - "tokio-util 0.6.9", - "unicase", -] - -[[package]] -name = "keccak" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" - -[[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 = "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.149" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" - -[[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 = "libm" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" - -[[package]] -name = "librocksdb-sys" -version = "0.11.0+8.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e" -dependencies = [ - "bindgen", - "bzip2-sys", - "cc", - "glob", - "libc", - "libz-sys", - "lz4-sys", -] - -[[package]] -name = "libsecp256k1" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d220bc1feda2ac231cb78c3d26f27676b8cf82c96971f7aeef3d0cf2797c73" -dependencies = [ - "arrayref", - "base64 0.12.3", - "digest 0.9.0", - "hmac-drbg", - "libsecp256k1-core", - "libsecp256k1-gen-ecmult", - "libsecp256k1-gen-genmult", - "rand 0.7.3", - "serde", - "sha2 0.9.9", - "typenum", -] - -[[package]] -name = "libsecp256k1-core" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f6ab710cec28cef759c5f18671a27dae2a5f952cdaaee1d8e2908cb2478a80" -dependencies = [ - "crunchy", - "digest 0.9.0", - "subtle", -] - -[[package]] -name = "libsecp256k1-gen-ecmult" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccab96b584d38fac86a83f07e659f0deafd0253dc096dab5a36d53efe653c5c3" -dependencies = [ - "libsecp256k1-core", -] - -[[package]] -name = "libsecp256k1-gen-genmult" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67abfe149395e3aa1c48a2beb32b068e2334402df8181f818d3aee2b304c4f5d" -dependencies = [ - "libsecp256k1-core", -] - -[[package]] -name = "libz-sys" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "light-poseidon" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c9a85a9752c549ceb7578064b4ed891179d20acd85f27318573b64d2d7ee7ee" -dependencies = [ - "ark-bn254", - "ark-ff", - "num-bigint 0.4.4", - "thiserror", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" - -[[package]] -name = "linux-raw-sys" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" - -[[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 = "lru" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" -dependencies = [ - "hashbrown 0.12.3", -] - -[[package]] -name = "lz4" -version = "1.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1" -dependencies = [ - "libc", - "lz4-sys", -] - -[[package]] -name = "lz4-sys" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "managed" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca88d725a0a943b096803bd34e73a4437208b6077654cc4ecb2947a5f91618d" - -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" - -[[package]] -name = "memchr" -version = "2.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" - -[[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.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" -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 = "merlin" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" -dependencies = [ - "byteorder", - "keccak", - "rand_core 0.6.4", - "zeroize", -] - -[[package]] -name = "mime" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" - -[[package]] -name = "min-max-heap" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2687e6cf9c00f48e9284cf9fd15f2ef341d03cc7743abf9df4c5f07fdee50b18" - -[[package]] -name = "minimal-lexical" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c64630dcdd71f1a64c435f54885086a0de5d6a12d104d69b165fb7d5286d677" - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" -dependencies = [ - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", -] - -[[package]] -name = "modular-bitfield" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53d79ba8304ac1c4f9eb3b9d281f21f7be9d4626f72ce7df4ad8fbde4f38a74" -dependencies = [ - "modular-bitfield-impl", - "static_assertions", -] - -[[package]] -name = "modular-bitfield-impl" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a7d5f7076603ebc68de2dc6a650ec331a062a13abaa346975be747bbfa4b789" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - -[[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 = "net2" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.9", -] - -[[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", - "pin-utils", -] - -[[package]] -name = "nix" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" -dependencies = [ - "bitflags 2.3.3", - "cfg-if 1.0.0", - "libc", -] - -[[package]] -name = "nom" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffd9d26838a953b4af82cbeb9f1592c6798916983959be223a7124e992742c1" -dependencies = [ - "memchr", - "minimal-lexical", - "version_check", -] - -[[package]] -name = "normalize-line-endings" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - -[[package]] -name = "num" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36" -dependencies = [ - "num-bigint 0.2.6", - "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-bigint" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" -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-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-derive" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[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.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.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" -dependencies = [ - "autocfg", - "num-bigint 0.2.6", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -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.1", - "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" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0" -dependencies = [ - "num_enum_derive 0.7.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 1.1.0", - "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 1.1.0", - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "num_enum_derive" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e" -dependencies = [ - "proc-macro-crate 1.1.0", - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "num_threads" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ba99ba6393e2c3734791401b66902d981cb03bf190af674ca69949b6d5fb15" -dependencies = [ - "libc", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "object" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" -dependencies = [ - "memchr", -] - -[[package]] -name = "oid-registry" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d4bda43fd1b844cbc6e6e54b5444e2b1bc7838bce59ad205902cccbb26d6761" -dependencies = [ - "asn1-rs", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[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.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - -[[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.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" -dependencies = [ - "bitflags 2.3.3", - "cfg-if 1.0.0", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[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.25.0+1.1.1t" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3173cd3626c43e3854b1b727422a276e568d9ec5fe8cec197822cf52cfb743d6" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" -dependencies = [ - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "opentelemetry" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" -dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "js-sys", - "lazy_static", - "percent-encoding 2.3.0", - "pin-project", - "rand 0.8.5", - "thiserror", -] - -[[package]] -name = "os_str_bytes" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" - -[[package]] -name = "ouroboros" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1358bd1558bd2a083fed428ffeda486fbfb323e698cdda7794259d592ca72db" -dependencies = [ - "aliasable", - "ouroboros_macro", -] - -[[package]] -name = "ouroboros_macro" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7" -dependencies = [ - "Inflector", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "parity-tokio-ipc" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9981e32fb75e004cc148f5fb70342f393830e0a4aa62e3cc93b50976218d42b6" -dependencies = [ - "futures 0.3.28", - "libc", - "log", - "rand 0.7.3", - "tokio", - "winapi 0.3.9", -] - -[[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.5", -] - -[[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.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 0.3.9", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall 0.3.5", - "smallvec", - "windows-targets 0.48.0", -] - -[[package]] -name = "paste" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" - -[[package]] -name = "pbkdf2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" -dependencies = [ - "crypto-mac", -] - -[[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest 0.10.7", -] - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "pem" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" -dependencies = [ - "base64 0.13.1", -] - -[[package]] -name = "percent-encoding" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "percentage" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd23b938276f14057220b707937bcb42fa76dda7560e57a2da30cb52d557937" -dependencies = [ - "num", -] - -[[package]] -name = "pest" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" -dependencies = [ - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "pest_meta" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d" -dependencies = [ - "maplit", - "pest", - "sha-1 0.8.2", -] - -[[package]] -name = "petgraph" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" -dependencies = [ - "fixedbitset", - "indexmap 1.9.3", -] - -[[package]] -name = "pickledb" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c53a5ade47760e8cc4986bdc5e72daeffaaaee64cbc374f9cfe0a00c1cd87b1f" -dependencies = [ - "serde", - "serde_yaml 0.8.26", -] - -[[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.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 = "pkcs8" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" -dependencies = [ - "der", - "spki", - "zeroize", -] - -[[package]] -name = "pkg-config" -version = "0.3.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f" - -[[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 = "polyval" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "opaque-debug 0.3.0", - "universal-hash", -] - -[[package]] -name = "portable-atomic" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc59d1bcc64fc5d021d67521f818db868368028108d37f0e98d74e33f68297b5" - -[[package]] -name = "ppv-lite86" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" - -[[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-core" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451" - -[[package]] -name = "predicates-tree" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "338c7be2905b732ae3984a2f40032b5e94fd8f52505b186c7d4d68d193445df7" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "pretty-hex" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" - -[[package]] -name = "prettyplease" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b83ec2d0af5c5c556257ff52c9f98934e243b9fd39604bfb2a9b75ec2e97f18" -dependencies = [ - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "prettyplease" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058" -dependencies = [ - "proc-macro2", - "syn 2.0.38", -] - -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml", -] - -[[package]] -name = "proc-macro-crate" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83" -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 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 = "proptest" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e" -dependencies = [ - "bit-set", - "bit-vec", - "bitflags 2.3.3", - "lazy_static", - "num-traits", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rand_xorshift", - "regex-syntax 0.7.5", - "rusty-fork", - "tempfile", - "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 0.1.9", - "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 = "proto" -version = "1.17.28" -dependencies = [ - "protobuf-src", - "tonic-build", -] - -[[package]] -name = "protobuf-src" -version = "1.1.0+21.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7ac8852baeb3cc6fb83b93646fb93c0ffe5d14bf138c945ceb4b9948ee0e3c1" -dependencies = [ - "autotools", -] - -[[package]] -name = "qstring" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d464fae65fff2680baf48019211ce37aaec0c78e9264c84a3e484717f965104e" -dependencies = [ - "percent-encoding 2.3.0", -] - -[[package]] -name = "qualifier_attr" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e2e25ee72f5b24d773cae88422baddefff7714f97aab68d96fe2b6fc4a28fb2" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[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.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" -dependencies = [ - "bytes", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash", - "rustls", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "quinn-proto" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c78e758510582acc40acb90458401172d41f1016f8c9dde89e49677afb7eec1" -dependencies = [ - "bytes", - "rand 0.8.5", - "ring", - "rustc-hash", - "rustls", - "rustls-native-certs", - "slab", - "thiserror", - "tinyvec", - "tracing", -] - -[[package]] -name = "quinn-udp" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6df19e284d93757a9fb91d63672f7741b129246a669db09d1c0063071debc0c0" -dependencies = [ - "bytes", - "libc", - "socket2 0.5.5", - "tracing", - "windows-sys 0.48.0", -] - -[[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.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 0.3.9", -] - -[[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.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" -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.10", -] - -[[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 = "raptorq" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "655b020bbf5c89791160a30f0d4706d8ec7aa5718d6a198f6df19c400e4f4470" - -[[package]] -name = "rayon" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "rbpf-cli" -version = "1.17.28" - -[[package]] -name = "rcgen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" -dependencies = [ - "pem", - "ring", - "time", - "yasna", -] - -[[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.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" -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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" -dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.10", -] - -[[package]] -name = "reed-solomon-erasure" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7263373d500d4d4f505d43a2a662d475a894aa94503a1ee28e9188b5f3960d4f" -dependencies = [ - "cc", - "libc", - "libm", - "lru", - "parking_lot 0.11.2", - "smallvec", - "spin 0.9.2", -] - -[[package]] -name = "regex" -version = "1.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" -dependencies = [ - "aho-corasick 1.0.1", - "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" - -[[package]] -name = "regex-automata" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" -dependencies = [ - "aho-corasick 1.0.1", - "memchr", - "regex-syntax 0.8.2", -] - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "reqwest" -version = "0.11.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" -dependencies = [ - "async-compression", - "base64 0.21.4", - "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 2.3.0", - "pin-project-lite", - "rustls", - "rustls-pemfile 1.0.0", - "serde", - "serde_json", - "serde_urlencoded", - "system-configuration", - "tokio", - "tokio-native-tls", - "tokio-rustls", - "tokio-util 0.7.1", - "tower-service", - "url 2.4.1", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots 0.25.2", - "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", - "web-sys", - "winapi 0.3.9", -] - -[[package]] -name = "rocksdb" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe" -dependencies = [ - "libc", - "librocksdb-sys", -] - -[[package]] -name = "rolling-file" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8395b4f860856b740f20a296ea2cd4d823e81a2658cf05ef61be22916026a906" -dependencies = [ - "chrono", -] - -[[package]] -name = "rpassword" -version = "7.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" -dependencies = [ - "libc", - "rtoolbox", - "winapi 0.3.9", -] - -[[package]] -name = "rtoolbox" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" - -[[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.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -dependencies = [ - "semver 0.11.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.20", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac5ffa1efe7548069688cd7028f32591853cd7b5b756d41bcffd2353e4fc75b4" -dependencies = [ - "bitflags 2.3.3", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustls" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" -dependencies = [ - "log", - "ring", - "rustls-webpki", - "sct", -] - -[[package]] -name = "rustls-native-certs" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca9ebdfa27d3fc180e42879037b5338ab1c040c06affd00d8338598e7800943" -dependencies = [ - "openssl-probe", - "rustls-pemfile 0.2.1", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" -dependencies = [ - "base64 0.13.1", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9" -dependencies = [ - "base64 0.13.1", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "rusty-fork" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" -dependencies = [ - "fnv", - "quick-error", - "tempfile", - "wait-timeout", -] - -[[package]] -name = "ryu" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - -[[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.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" -dependencies = [ - "lazy_static", - "winapi 0.3.9", -] - -[[package]] -name = "scopeguard" -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.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.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" -dependencies = [ - "bitflags 1.3.2", - "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.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" -dependencies = [ - "serde", -] - -[[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.189" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_bytes" -version = "0.11.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.189" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" -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_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 = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" -dependencies = [ - "serde", - "serde_with_macros", -] - -[[package]] -name = "serde_with_macros" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "serde_yaml" -version = "0.8.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" -dependencies = [ - "indexmap 1.9.3", - "ryu", - "serde", - "yaml-rust", -] - -[[package]] -name = "serde_yaml" -version = "0.9.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" -dependencies = [ - "indexmap 2.0.2", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - -[[package]] -name = "serial_test" -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", - "lazy_static", - "log", - "parking_lot 0.12.1", - "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.38", -] - -[[package]] -name = "sha-1" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" -dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "fake-simd", - "opaque-debug 0.2.3", -] - -[[package]] -name = "sha-1" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.9.0", - "opaque-debug 0.3.0", -] - -[[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 0.10.7", -] - -[[package]] -name = "sha1" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" -dependencies = [ - "cfg-if 1.0.0", - "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 1.0.0", - "cpufeatures", - "digest 0.9.0", - "opaque-debug 0.3.0", -] - -[[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 0.10.7", -] - -[[package]] -name = "sha3" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" -dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", - "keccak", - "opaque-debug 0.3.0", -] - -[[package]] -name = "sha3" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaedf34ed289ea47c2b741bb72e5357a209512d67bcd4bda44359e5bf0470f56" -dependencies = [ - "digest 0.10.7", - "keccak", -] - -[[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 = "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 = "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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" -dependencies = [ - "libc", -] - -[[package]] -name = "signature" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788" - -[[package]] -name = "simpl" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a30f10c911c0355f80f1c2faa8096efc4a58cdf8590b954d5b395efa071c711" - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "sized-chunks" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" -dependencies = [ - "bitmaps", - "typenum", -] - -[[package]] -name = "slab" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" - -[[package]] -name = "smallvec" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" - -[[package]] -name = "smpl_jwt" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b6ff8c21c74ce7744643a7cddbb02579a44f1f77e4316bff1ddb741aca8ac9" -dependencies = [ - "base64 0.13.1", - "log", - "openssl", - "serde", - "serde_derive", - "serde_json", - "simpl", - "time", -] - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[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 = "soketto" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" -dependencies = [ - "base64 0.13.1", - "bytes", - "futures 0.3.28", - "httparse", - "log", - "rand 0.8.5", - "sha-1 0.9.8", -] - -[[package]] -name = "solana-account-decoder" -version = "1.17.28" -dependencies = [ - "Inflector", - "assert_matches", - "base64 0.21.4", - "bincode", - "bs58", - "bv", - "lazy_static", - "serde", - "serde_derive", - "serde_json", - "solana-config-program", - "solana-sdk", - "spl-pod", - "spl-token", - "spl-token-2022", - "spl-token-group-interface", - "spl-token-metadata-interface", - "thiserror", - "zstd", -] - -[[package]] -name = "solana-accounts-bench" -version = "1.17.28" -dependencies = [ - "clap 2.33.3", - "log", - "rayon", - "solana-accounts-db", - "solana-logger", - "solana-measure", - "solana-sdk", - "solana-version", -] - -[[package]] -name = "solana-accounts-cluster-bench" -version = "1.17.28" -dependencies = [ - "clap 2.33.3", - "log", - "rand 0.8.5", - "rayon", - "solana-account-decoder", - "solana-accounts-db", - "solana-clap-utils", - "solana-cli-config", - "solana-client", - "solana-core", - "solana-faucet", - "solana-gossip", - "solana-local-cluster", - "solana-logger", - "solana-measure", - "solana-net-utils", - "solana-rpc-client", - "solana-runtime", - "solana-sdk", - "solana-streamer", - "solana-test-validator", - "solana-transaction-status", - "solana-version", - "spl-token", -] - -[[package]] -name = "solana-accounts-db" -version = "1.17.28" -dependencies = [ - "arrayref", - "assert_matches", - "bincode", - "blake3", - "bv", - "bytemuck", - "byteorder", - "bzip2", - "crossbeam-channel", - "dashmap 4.0.2", - "ed25519-dalek", - "flate2", - "fnv", - "fs-err", - "im", - "index_list", - "itertools", - "lazy_static", - "libsecp256k1", - "log", - "lz4", - "memmap2", - "memoffset 0.9.0", - "modular-bitfield", - "num-derive 0.3.3", - "num-traits", - "num_cpus", - "num_enum 0.6.1", - "ouroboros", - "percentage", - "qualifier_attr", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rayon", - "regex", - "rustc_version 0.4.0", - "serde", - "serde_derive", - "solana-accounts-db", - "solana-bucket-map", - "solana-config-program", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-logger", - "solana-measure", - "solana-metrics", - "solana-program-runtime", - "solana-rayon-threadlimit", - "solana-sdk", - "solana-stake-program", - "solana-system-program", - "solana-vote-program", - "static_assertions", - "strum", - "strum_macros", - "tar", - "tempfile", - "thiserror", -] - -[[package]] -name = "solana-address-lookup-table-program" -version = "1.17.28" -dependencies = [ - "bincode", - "bytemuck", - "log", - "num-derive 0.3.3", - "num-traits", - "rustc_version 0.4.0", - "serde", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-program", - "solana-program-runtime", - "solana-sdk", - "thiserror", -] - -[[package]] -name = "solana-address-lookup-table-program-tests" -version = "1.17.28" -dependencies = [ - "assert_matches", - "bincode", - "solana-address-lookup-table-program", - "solana-program-test", - "solana-sdk", -] - -[[package]] -name = "solana-banking-bench" -version = "1.17.28" -dependencies = [ - "clap 3.2.23", - "crossbeam-channel", - "log", - "rand 0.8.5", - "rayon", - "solana-client", - "solana-core", - "solana-gossip", - "solana-ledger", - "solana-logger", - "solana-measure", - "solana-perf", - "solana-poh", - "solana-runtime", - "solana-sdk", - "solana-streamer", - "solana-tpu-client", - "solana-version", -] - -[[package]] -name = "solana-banks-client" -version = "1.17.28" -dependencies = [ - "borsh 0.10.3", - "futures 0.3.28", - "solana-banks-interface", - "solana-banks-server", - "solana-program", - "solana-runtime", - "solana-sdk", - "tarpc", - "thiserror", - "tokio", - "tokio-serde", -] - -[[package]] -name = "solana-banks-interface" -version = "1.17.28" -dependencies = [ - "serde", - "solana-sdk", - "tarpc", -] - -[[package]] -name = "solana-banks-server" -version = "1.17.28" -dependencies = [ - "bincode", - "crossbeam-channel", - "futures 0.3.28", - "solana-accounts-db", - "solana-banks-interface", - "solana-client", - "solana-runtime", - "solana-sdk", - "solana-send-transaction-service", - "tarpc", - "tokio", - "tokio-serde", -] - -[[package]] -name = "solana-bench-streamer" -version = "1.17.28" -dependencies = [ - "clap 3.2.23", - "crossbeam-channel", - "solana-net-utils", - "solana-streamer", - "solana-version", -] - -[[package]] -name = "solana-bench-tps" -version = "1.17.28" -dependencies = [ - "clap 2.33.3", - "crossbeam-channel", - "log", - "rand 0.8.5", - "rayon", - "serde_json", - "serde_yaml 0.9.25", - "serial_test", - "solana-clap-utils", - "solana-cli-config", - "solana-client", - "solana-connection-cache", - "solana-core", - "solana-faucet", - "solana-genesis", - "solana-gossip", - "solana-local-cluster", - "solana-logger", - "solana-measure", - "solana-metrics", - "solana-net-utils", - "solana-rpc", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-rpc-client-nonce-utils", - "solana-runtime", - "solana-sdk", - "solana-streamer", - "solana-test-validator", - "solana-thin-client", - "solana-tpu-client", - "solana-version", - "spl-instruction-padding", - "tempfile", - "thiserror", -] - -[[package]] -name = "solana-bloom" -version = "1.17.28" -dependencies = [ - "bv", - "fnv", - "log", - "rand 0.8.5", - "rayon", - "rustc_version 0.4.0", - "serde", - "serde_derive", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-sdk", -] - -[[package]] -name = "solana-bpf-loader-program" -version = "1.17.28" -dependencies = [ - "assert_matches", - "bincode", - "byteorder", - "libsecp256k1", - "log", - "memoffset 0.9.0", - "rand 0.8.5", - "scopeguard", - "solana-measure", - "solana-program-runtime", - "solana-sdk", - "solana-zk-token-sdk", - "solana_rbpf", - "test-case", - "thiserror", -] - -[[package]] -name = "solana-bpf-loader-program-tests" -version = "1.17.28" -dependencies = [ - "assert_matches", - "bincode", - "solana-bpf-loader-program", - "solana-program-test", - "solana-sdk", -] - -[[package]] -name = "solana-bucket-map" -version = "1.17.28" -dependencies = [ - "bv", - "bytemuck", - "fs_extra", - "log", - "memmap2", - "modular-bitfield", - "num_enum 0.6.1", - "rand 0.8.5", - "rayon", - "solana-logger", - "solana-measure", - "solana-sdk", - "tempfile", -] - -[[package]] -name = "solana-cargo-build-bpf" -version = "1.17.28" -dependencies = [ - "log", - "solana-logger", -] - -[[package]] -name = "solana-cargo-build-sbf" -version = "1.17.28" -dependencies = [ - "assert_cmd", - "bzip2", - "cargo_metadata", - "clap 3.2.23", - "itertools", - "log", - "predicates", - "regex", - "reqwest", - "semver 1.0.20", - "serial_test", - "solana-download-utils", - "solana-logger", - "solana-sdk", - "tar", -] - -[[package]] -name = "solana-cargo-test-bpf" -version = "1.17.28" - -[[package]] -name = "solana-cargo-test-sbf" -version = "1.17.28" -dependencies = [ - "cargo_metadata", - "clap 3.2.23", - "itertools", - "log", - "solana-logger", -] - -[[package]] -name = "solana-clap-utils" -version = "1.17.28" -dependencies = [ - "assert_matches", - "chrono", - "clap 2.33.3", - "rpassword", - "solana-remote-wallet", - "solana-sdk", - "tempfile", - "thiserror", - "tiny-bip39", - "uriparse", - "url 2.4.1", -] - -[[package]] -name = "solana-clap-v3-utils" -version = "1.17.28" -dependencies = [ - "assert_matches", - "chrono", - "clap 3.2.23", - "rpassword", - "solana-remote-wallet", - "solana-sdk", - "solana-zk-token-sdk", - "tempfile", - "thiserror", - "tiny-bip39", - "uriparse", - "url 2.4.1", -] - -[[package]] -name = "solana-cli" -version = "1.17.28" -dependencies = [ - "assert_matches", - "bincode", - "bs58", - "clap 2.33.3", - "console", - "const_format", - "criterion-stats", - "crossbeam-channel", - "ctrlc", - "hex", - "humantime", - "log", - "num-traits", - "pretty-hex", - "reqwest", - "semver 1.0.20", - "serde", - "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-bpf-loader-program", - "solana-clap-utils", - "solana-cli-config", - "solana-cli-output", - "solana-client", - "solana-config-program", - "solana-faucet", - "solana-loader-v4-program", - "solana-logger", - "solana-program-runtime", - "solana-pubsub-client", - "solana-remote-wallet", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-rpc-client-nonce-utils", - "solana-sdk", - "solana-streamer", - "solana-test-validator", - "solana-tpu-client", - "solana-transaction-status", - "solana-version", - "solana-vote-program", - "solana_rbpf", - "spl-memo", - "tempfile", - "thiserror", - "tiny-bip39", -] - -[[package]] -name = "solana-cli-config" -version = "1.17.28" -dependencies = [ - "anyhow", - "dirs-next", - "lazy_static", - "serde", - "serde_derive", - "serde_yaml 0.9.25", - "solana-clap-utils", - "solana-sdk", - "url 2.4.1", -] - -[[package]] -name = "solana-cli-output" -version = "1.17.28" -dependencies = [ - "Inflector", - "base64 0.21.4", - "chrono", - "clap 2.33.3", - "console", - "ed25519-dalek", - "humantime", - "indicatif", - "pretty-hex", - "semver 1.0.20", - "serde", - "serde_json", - "solana-account-decoder", - "solana-clap-utils", - "solana-cli-config", - "solana-rpc-client-api", - "solana-sdk", - "solana-transaction-status", - "solana-vote-program", - "spl-memo", -] - -[[package]] -name = "solana-client" -version = "1.17.28" -dependencies = [ - "async-trait", - "bincode", - "crossbeam-channel", - "dashmap 4.0.2", - "futures 0.3.28", - "futures-util", - "indexmap 2.0.2", - "indicatif", - "log", - "quinn", - "rayon", - "solana-connection-cache", - "solana-measure", - "solana-metrics", - "solana-pubsub-client", - "solana-quic-client", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-rpc-client-nonce-utils", - "solana-sdk", - "solana-streamer", - "solana-thin-client", - "solana-tpu-client", - "solana-udp-client", - "thiserror", - "tokio", -] - -[[package]] -name = "solana-client-test" -version = "1.17.28" -dependencies = [ - "futures-util", - "rand 0.8.5", - "serde_json", - "solana-client", - "solana-ledger", - "solana-logger", - "solana-measure", - "solana-merkle-tree", - "solana-metrics", - "solana-perf", - "solana-pubsub-client", - "solana-rayon-threadlimit", - "solana-rpc", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-runtime", - "solana-sdk", - "solana-streamer", - "solana-test-validator", - "solana-transaction-status", - "solana-version", - "systemstat", - "tokio", - "tungstenite", -] - -[[package]] -name = "solana-compute-budget-program" -version = "1.17.28" -dependencies = [ - "solana-program-runtime", - "solana-sdk", -] - -[[package]] -name = "solana-config-program" -version = "1.17.28" -dependencies = [ - "bincode", - "chrono", - "serde", - "serde_derive", - "solana-logger", - "solana-program-runtime", - "solana-sdk", -] - -[[package]] -name = "solana-connection-cache" -version = "1.17.28" -dependencies = [ - "async-trait", - "bincode", - "crossbeam-channel", - "futures-util", - "indexmap 2.0.2", - "indicatif", - "log", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rayon", - "rcgen", - "solana-logger", - "solana-measure", - "solana-metrics", - "solana-net-utils", - "solana-sdk", - "thiserror", - "tokio", -] - -[[package]] -name = "solana-core" -version = "1.17.28" -dependencies = [ - "assert_matches", - "base64 0.21.4", - "bincode", - "bs58", - "bytes", - "chrono", - "crossbeam-channel", - "dashmap 4.0.2", - "eager", - "etcd-client", - "fs_extra", - "futures 0.3.28", - "histogram", - "itertools", - "lazy_static", - "log", - "lru", - "min-max-heap", - "num_enum 0.6.1", - "quinn", - "rand 0.8.5", - "rand_chacha 0.3.1", - "raptorq", - "rayon", - "rcgen", - "rolling-file", - "rustc_version 0.4.0", - "rustls", - "serde", - "serde_bytes", - "serde_derive", - "serde_json", - "serial_test", - "solana-accounts-db", - "solana-bloom", - "solana-client", - "solana-core", - "solana-cost-model", - "solana-entry", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-geyser-plugin-manager", - "solana-gossip", - "solana-ledger", - "solana-logger", - "solana-measure", - "solana-metrics", - "solana-net-utils", - "solana-perf", - "solana-poh", - "solana-program-runtime", - "solana-quic-client", - "solana-rayon-threadlimit", - "solana-rpc", - "solana-rpc-client-api", - "solana-runtime", - "solana-sdk", - "solana-send-transaction-service", - "solana-stake-program", - "solana-streamer", - "solana-tpu-client", - "solana-transaction-status", - "solana-turbine", - "solana-version", - "solana-vote", - "solana-vote-program", - "static_assertions", - "strum", - "strum_macros", - "sys-info", - "sysctl", - "systemstat", - "tempfile", - "test-case", - "thiserror", - "tokio", - "trees", -] - -[[package]] -name = "solana-cost-model" -version = "1.17.28" -dependencies = [ - "lazy_static", - "log", - "rustc_version 0.4.0", - "solana-address-lookup-table-program", - "solana-bpf-loader-program", - "solana-compute-budget-program", - "solana-config-program", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-loader-v4-program", - "solana-logger", - "solana-metrics", - "solana-program-runtime", - "solana-sdk", - "solana-stake-program", - "solana-system-program", - "solana-vote-program", - "static_assertions", - "test-case", -] - -[[package]] -name = "solana-dos" -version = "1.17.28" -dependencies = [ - "bincode", - "clap 3.2.23", - "crossbeam-channel", - "itertools", - "log", - "rand 0.8.5", - "serde", - "solana-bench-tps", - "solana-client", - "solana-core", - "solana-faucet", - "solana-gossip", - "solana-local-cluster", - "solana-logger", - "solana-measure", - "solana-net-utils", - "solana-perf", - "solana-rpc", - "solana-rpc-client", - "solana-sdk", - "solana-streamer", - "solana-thin-client", - "solana-tpu-client", - "solana-version", -] - -[[package]] -name = "solana-download-utils" -version = "1.17.28" -dependencies = [ - "console", - "indicatif", - "log", - "reqwest", - "solana-runtime", - "solana-sdk", -] - -[[package]] -name = "solana-ed25519-program-tests" -version = "1.17.28" -dependencies = [ - "assert_matches", - "ed25519-dalek", - "rand 0.8.5", - "solana-program-test", - "solana-sdk", -] - -[[package]] -name = "solana-entry" -version = "1.17.28" -dependencies = [ - "assert_matches", - "bincode", - "crossbeam-channel", - "dlopen2", - "lazy_static", - "log", - "rand 0.8.5", - "rayon", - "serde", - "solana-logger", - "solana-measure", - "solana-merkle-tree", - "solana-metrics", - "solana-perf", - "solana-rayon-threadlimit", - "solana-sdk", -] - -[[package]] -name = "solana-faucet" -version = "1.17.28" -dependencies = [ - "bincode", - "byteorder", - "clap 2.33.3", - "crossbeam-channel", - "log", - "serde", - "serde_derive", - "solana-clap-utils", - "solana-cli-config", - "solana-logger", - "solana-metrics", - "solana-sdk", - "solana-version", - "spl-memo", - "thiserror", - "tokio", -] - -[[package]] -name = "solana-frozen-abi" -version = "1.17.28" -dependencies = [ - "ahash 0.8.5", - "bitflags 2.3.3", - "blake3", - "block-buffer 0.10.4", - "bs58", - "bv", - "byteorder", - "cc", - "either", - "generic-array 0.14.7", - "im", - "lazy_static", - "log", - "memmap2", - "rustc_version 0.4.0", - "serde", - "serde_bytes", - "serde_derive", - "serde_json", - "sha2 0.10.8", - "solana-frozen-abi-macro", - "solana-logger", - "subtle", - "thiserror", -] - -[[package]] -name = "solana-frozen-abi-macro" -version = "1.17.28" -dependencies = [ - "proc-macro2", - "quote", - "rustc_version 0.4.0", - "syn 2.0.38", -] - -[[package]] -name = "solana-genesis" -version = "1.17.28" -dependencies = [ - "base64 0.21.4", - "bincode", - "clap 2.33.3", - "itertools", - "serde", - "serde_json", - "serde_yaml 0.9.25", - "solana-accounts-db", - "solana-clap-utils", - "solana-cli-config", - "solana-entry", - "solana-ledger", - "solana-logger", - "solana-runtime", - "solana-sdk", - "solana-stake-program", - "solana-version", - "solana-vote-program", - "tempfile", -] - -[[package]] -name = "solana-genesis-utils" -version = "1.17.28" -dependencies = [ - "log", - "solana-accounts-db", - "solana-download-utils", - "solana-rpc-client", - "solana-sdk", -] - -[[package]] -name = "solana-geyser-plugin-interface" -version = "1.17.28" -dependencies = [ - "log", - "solana-sdk", - "solana-transaction-status", - "thiserror", -] - -[[package]] -name = "solana-geyser-plugin-manager" -version = "1.17.28" -dependencies = [ - "bs58", - "crossbeam-channel", - "json5", - "jsonrpc-core", - "jsonrpc-server-utils", - "libloading", - "log", - "serde_json", - "solana-accounts-db", - "solana-entry", - "solana-geyser-plugin-interface", - "solana-ledger", - "solana-measure", - "solana-metrics", - "solana-rpc", - "solana-runtime", - "solana-sdk", - "solana-transaction-status", - "thiserror", -] - -[[package]] -name = "solana-gossip" -version = "1.17.28" -dependencies = [ - "assert_matches", - "bincode", - "bv", - "clap 2.33.3", - "crossbeam-channel", - "flate2", - "indexmap 2.0.2", - "itertools", - "log", - "lru", - "num-traits", - "num_cpus", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rayon", - "rustc_version 0.4.0", - "rustversion", - "serde", - "serde_bytes", - "serde_derive", - "serial_test", - "solana-bloom", - "solana-clap-utils", - "solana-client", - "solana-entry", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-ledger", - "solana-logger", - "solana-measure", - "solana-metrics", - "solana-net-utils", - "solana-perf", - "solana-rayon-threadlimit", - "solana-runtime", - "solana-sdk", - "solana-streamer", - "solana-thin-client", - "solana-tpu-client", - "solana-version", - "solana-vote", - "solana-vote-program", - "static_assertions", - "test-case", - "thiserror", -] - -[[package]] -name = "solana-install" -version = "1.17.28" -dependencies = [ - "atty", - "bincode", - "bzip2", - "chrono", - "clap 2.33.3", - "console", - "crossbeam-channel", - "ctrlc", - "dirs-next", - "indicatif", - "lazy_static", - "nix 0.26.4", - "reqwest", - "scopeguard", - "semver 1.0.20", - "serde", - "serde_yaml 0.8.26", - "serde_yaml 0.9.25", - "solana-clap-utils", - "solana-config-program", - "solana-logger", - "solana-rpc-client", - "solana-sdk", - "solana-version", - "tar", - "tempfile", - "url 2.4.1", - "winapi 0.3.9", - "winreg", -] - -[[package]] -name = "solana-keygen" -version = "1.17.28" -dependencies = [ - "bs58", - "clap 3.2.23", - "dirs-next", - "num_cpus", - "solana-clap-v3-utils", - "solana-cli-config", - "solana-remote-wallet", - "solana-sdk", - "solana-version", - "tempfile", - "tiny-bip39", -] - -[[package]] -name = "solana-ledger" -version = "1.17.28" -dependencies = [ - "assert_matches", - "bincode", - "bitflags 2.3.3", - "bs58", - "byteorder", - "chrono", - "chrono-humanize", - "crossbeam-channel", - "dashmap 4.0.2", - "fs_extra", - "futures 0.3.28", - "itertools", - "lazy_static", - "libc", - "log", - "lru", - "num_cpus", - "num_enum 0.6.1", - "prost", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rayon", - "reed-solomon-erasure", - "rocksdb", - "rustc_version 0.4.0", - "scopeguard", - "serde", - "serde_bytes", - "sha2 0.10.8", - "solana-account-decoder", - "solana-accounts-db", - "solana-bpf-loader-program", - "solana-cost-model", - "solana-entry", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-logger", - "solana-measure", - "solana-metrics", - "solana-perf", - "solana-program-runtime", - "solana-rayon-threadlimit", - "solana-runtime", - "solana-sdk", - "solana-stake-program", - "solana-storage-bigtable", - "solana-storage-proto", - "solana-transaction-status", - "solana-vote", - "solana-vote-program", - "spl-pod", - "spl-token", - "spl-token-2022", - "static_assertions", - "strum", - "strum_macros", - "tempfile", - "test-case", - "thiserror", - "tokio", - "tokio-stream", - "trees", -] - -[[package]] -name = "solana-ledger-tool" -version = "1.17.28" -dependencies = [ - "assert_cmd", - "bs58", - "bytecount", - "chrono", - "clap 2.33.3", - "crossbeam-channel", - "csv", - "dashmap 4.0.2", - "futures 0.3.28", - "histogram", - "itertools", - "log", - "num_cpus", - "regex", - "serde", - "serde_json", - "signal-hook", - "solana-account-decoder", - "solana-accounts-db", - "solana-bpf-loader-program", - "solana-clap-utils", - "solana-cli-output", - "solana-core", - "solana-cost-model", - "solana-entry", - "solana-geyser-plugin-manager", - "solana-gossip", - "solana-ledger", - "solana-logger", - "solana-measure", - "solana-program-runtime", - "solana-rpc", - "solana-runtime", - "solana-sdk", - "solana-stake-program", - "solana-storage-bigtable", - "solana-streamer", - "solana-transaction-status", - "solana-version", - "solana-vote-program", - "solana_rbpf", - "tikv-jemallocator", - "tokio", -] - -[[package]] -name = "solana-loader-v4-program" -version = "1.17.28" -dependencies = [ - "bincode", - "log", - "solana-measure", - "solana-program-runtime", - "solana-sdk", - "solana_rbpf", -] - -[[package]] -name = "solana-local-cluster" -version = "1.17.28" -dependencies = [ - "assert_matches", - "crossbeam-channel", - "fs_extra", - "gag", - "itertools", - "log", - "rand 0.8.5", - "rayon", - "serial_test", - "solana-accounts-db", - "solana-client", - "solana-config-program", - "solana-core", - "solana-download-utils", - "solana-entry", - "solana-gossip", - "solana-ledger", - "solana-logger", - "solana-pubsub-client", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-runtime", - "solana-sdk", - "solana-stake-program", - "solana-streamer", - "solana-thin-client", - "solana-tpu-client", - "solana-turbine", - "solana-vote", - "solana-vote-program", - "static_assertions", - "tempfile", - "trees", -] - -[[package]] -name = "solana-log-analyzer" -version = "1.17.28" -dependencies = [ - "byte-unit", - "clap 3.2.23", - "serde", - "serde_json", - "solana-logger", - "solana-version", -] - -[[package]] -name = "solana-logger" -version = "1.17.28" -dependencies = [ - "env_logger", - "lazy_static", - "log", -] - -[[package]] -name = "solana-measure" -version = "1.17.28" -dependencies = [ - "log", - "solana-sdk", -] - -[[package]] -name = "solana-memory-management" -version = "1.17.28" - -[[package]] -name = "solana-merkle-root-bench" -version = "1.17.28" -dependencies = [ - "clap 2.33.3", - "log", - "solana-accounts-db", - "solana-logger", - "solana-measure", - "solana-sdk", - "solana-version", -] - -[[package]] -name = "solana-merkle-tree" -version = "1.17.28" -dependencies = [ - "fast-math", - "hex", - "solana-program", -] - -[[package]] -name = "solana-metrics" -version = "1.17.28" -dependencies = [ - "crossbeam-channel", - "env_logger", - "gethostname", - "lazy_static", - "log", - "rand 0.8.5", - "reqwest", - "serial_test", - "solana-sdk", - "thiserror", -] - -[[package]] -name = "solana-net-shaper" -version = "1.17.28" -dependencies = [ - "clap 3.2.23", - "rand 0.8.5", - "serde", - "serde_json", - "solana-logger", -] - -[[package]] -name = "solana-net-utils" -version = "1.17.28" -dependencies = [ - "bincode", - "clap 3.2.23", - "crossbeam-channel", - "log", - "nix 0.26.4", - "rand 0.8.5", - "serde", - "serde_derive", - "socket2 0.5.5", - "solana-logger", - "solana-sdk", - "solana-version", - "tokio", - "url 2.4.1", -] - -[[package]] -name = "solana-notifier" -version = "1.17.28" -dependencies = [ - "log", - "reqwest", - "serde_json", - "solana-sdk", -] - -[[package]] -name = "solana-perf" -version = "1.17.28" -dependencies = [ - "ahash 0.8.5", - "assert_matches", - "bincode", - "bv", - "caps", - "curve25519-dalek", - "dlopen2", - "fnv", - "lazy_static", - "libc", - "log", - "nix 0.26.4", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rayon", - "rustc_version 0.4.0", - "serde", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-logger", - "solana-metrics", - "solana-rayon-threadlimit", - "solana-sdk", - "solana-vote-program", - "test-case", -] - -[[package]] -name = "solana-poh" -version = "1.17.28" -dependencies = [ - "assert_matches", - "bincode", - "core_affinity", - "crossbeam-channel", - "log", - "rand 0.8.5", - "solana-entry", - "solana-ledger", - "solana-logger", - "solana-measure", - "solana-metrics", - "solana-perf", - "solana-runtime", - "solana-sdk", - "thiserror", -] - -[[package]] -name = "solana-poh-bench" -version = "1.17.28" -dependencies = [ - "clap 3.2.23", - "log", - "rayon", - "solana-entry", - "solana-logger", - "solana-measure", - "solana-perf", - "solana-sdk", - "solana-version", -] - -[[package]] -name = "solana-program" -version = "1.17.28" -dependencies = [ - "anyhow", - "ark-bn254", - "ark-ec", - "ark-ff", - "ark-serialize", - "array-bytes", - "assert_matches", - "base64 0.21.4", - "bincode", - "bitflags 2.3.3", - "blake3", - "borsh 0.10.3", - "borsh 0.9.3", - "bs58", - "bv", - "bytemuck", - "cc", - "console_error_panic_hook", - "console_log", - "curve25519-dalek", - "getrandom 0.2.10", - "itertools", - "js-sys", - "lazy_static", - "libc", - "libsecp256k1", - "light-poseidon", - "log", - "memoffset 0.9.0", - "num-bigint 0.4.4", - "num-derive 0.3.3", - "num-traits", - "parking_lot 0.12.1", - "rand 0.8.5", - "rustc_version 0.4.0", - "rustversion", - "serde", - "serde_bytes", - "serde_derive", - "serde_json", - "sha2 0.10.8", - "sha3 0.10.4", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-logger", - "solana-sdk-macro", - "static_assertions", - "thiserror", - "tiny-bip39", - "wasm-bindgen", - "zeroize", -] - -[[package]] -name = "solana-program-runtime" -version = "1.17.28" -dependencies = [ - "assert_matches", - "base64 0.21.4", - "bincode", - "eager", - "enum-iterator", - "itertools", - "libc", - "libsecp256k1", - "log", - "num-derive 0.3.3", - "num-traits", - "percentage", - "rand 0.8.5", - "rustc_version 0.4.0", - "serde", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-logger", - "solana-measure", - "solana-metrics", - "solana-sdk", - "solana_rbpf", - "thiserror", -] - -[[package]] -name = "solana-program-test" -version = "1.17.28" -dependencies = [ - "assert_matches", - "async-trait", - "base64 0.21.4", - "bincode", - "chrono-humanize", - "crossbeam-channel", - "log", - "serde", - "solana-accounts-db", - "solana-banks-client", - "solana-banks-interface", - "solana-banks-server", - "solana-bpf-loader-program", - "solana-logger", - "solana-program-runtime", - "solana-runtime", - "solana-sdk", - "solana-stake-program", - "solana-vote-program", - "solana_rbpf", - "test-case", - "thiserror", - "tokio", -] - -[[package]] -name = "solana-pubsub-client" -version = "1.17.28" -dependencies = [ - "anyhow", - "crossbeam-channel", - "futures-util", - "log", - "reqwest", - "semver 1.0.20", - "serde", - "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-rpc-client-api", - "solana-sdk", - "thiserror", - "tokio", - "tokio-stream", - "tokio-tungstenite", - "tungstenite", - "url 2.4.1", -] - -[[package]] -name = "solana-quic-client" -version = "1.17.28" -dependencies = [ - "async-mutex", - "async-trait", - "crossbeam-channel", - "futures 0.3.28", - "itertools", - "lazy_static", - "log", - "quinn", - "quinn-proto", - "rcgen", - "rustls", - "solana-connection-cache", - "solana-logger", - "solana-measure", - "solana-metrics", - "solana-net-utils", - "solana-perf", - "solana-rpc-client-api", - "solana-sdk", - "solana-streamer", - "thiserror", - "tokio", -] - -[[package]] -name = "solana-rayon-threadlimit" -version = "1.17.28" -dependencies = [ - "lazy_static", - "num_cpus", -] - -[[package]] -name = "solana-remote-wallet" -version = "1.17.28" -dependencies = [ - "assert_matches", - "console", - "dialoguer", - "hidapi", - "log", - "num-derive 0.3.3", - "num-traits", - "parking_lot 0.12.1", - "qstring", - "semver 1.0.20", - "solana-sdk", - "thiserror", - "uriparse", -] - -[[package]] -name = "solana-rpc" -version = "1.17.28" -dependencies = [ - "base64 0.21.4", - "bincode", - "bs58", - "crossbeam-channel", - "dashmap 4.0.2", - "itertools", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "jsonrpc-http-server", - "jsonrpc-pubsub", - "libc", - "log", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "serial_test", - "soketto", - "solana-account-decoder", - "solana-accounts-db", - "solana-client", - "solana-entry", - "solana-faucet", - "solana-gossip", - "solana-ledger", - "solana-measure", - "solana-metrics", - "solana-net-utils", - "solana-perf", - "solana-poh", - "solana-rayon-threadlimit", - "solana-rpc-client-api", - "solana-runtime", - "solana-sdk", - "solana-send-transaction-service", - "solana-stake-program", - "solana-storage-bigtable", - "solana-streamer", - "solana-tpu-client", - "solana-transaction-status", - "solana-version", - "solana-vote", - "solana-vote-program", - "spl-pod", - "spl-token", - "spl-token-2022", - "stream-cancel", - "symlink", - "thiserror", - "tokio", - "tokio-util 0.6.9", -] - -[[package]] -name = "solana-rpc-client" -version = "1.17.28" -dependencies = [ - "assert_matches", - "async-trait", - "base64 0.21.4", - "bincode", - "bs58", - "crossbeam-channel", - "futures 0.3.28", - "indicatif", - "jsonrpc-core", - "jsonrpc-http-server", - "log", - "reqwest", - "semver 1.0.20", - "serde", - "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-rpc-client-api", - "solana-sdk", - "solana-transaction-status", - "solana-version", - "solana-vote-program", - "tokio", -] - -[[package]] -name = "solana-rpc-client-api" -version = "1.17.28" -dependencies = [ - "base64 0.21.4", - "bs58", - "jsonrpc-core", - "reqwest", - "semver 1.0.20", - "serde", - "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-sdk", - "solana-transaction-status", - "solana-version", - "spl-token-2022", - "thiserror", -] - -[[package]] -name = "solana-rpc-client-nonce-utils" -version = "1.17.28" -dependencies = [ - "anyhow", - "clap 2.33.3", - "futures 0.3.28", - "serde_json", - "solana-account-decoder", - "solana-clap-utils", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-sdk", - "thiserror", - "tokio", -] - -[[package]] -name = "solana-rpc-test" -version = "1.17.28" -dependencies = [ - "bincode", - "bs58", - "crossbeam-channel", - "futures-util", - "log", - "reqwest", - "serde", - "serde_json", - "solana-account-decoder", - "solana-client", - "solana-logger", - "solana-pubsub-client", - "solana-rpc", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-sdk", - "solana-streamer", - "solana-test-validator", - "solana-tpu-client", - "solana-transaction-status", - "tokio", -] - -[[package]] -name = "solana-runtime" -version = "1.17.28" -dependencies = [ - "arrayref", - "assert_matches", - "base64 0.21.4", - "bincode", - "blake3", - "bv", - "bytemuck", - "byteorder", - "bzip2", - "crossbeam-channel", - "dashmap 4.0.2", - "dir-diff", - "ed25519-dalek", - "flate2", - "fnv", - "fs-err", - "im", - "index_list", - "itertools", - "lazy_static", - "libsecp256k1", - "log", - "lru", - "lz4", - "memmap2", - "memoffset 0.9.0", - "modular-bitfield", - "num-derive 0.3.3", - "num-traits", - "num_cpus", - "num_enum 0.6.1", - "ouroboros", - "percentage", - "qualifier_attr", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rayon", - "regex", - "rustc_version 0.4.0", - "serde", - "serde_derive", - "serde_json", - "siphasher", - "solana-accounts-db", - "solana-address-lookup-table-program", - "solana-bpf-loader-program", - "solana-bucket-map", - "solana-compute-budget-program", - "solana-config-program", - "solana-cost-model", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-loader-v4-program", - "solana-logger", - "solana-measure", - "solana-metrics", - "solana-perf", - "solana-program-runtime", - "solana-rayon-threadlimit", - "solana-runtime", - "solana-sdk", - "solana-stake-program", - "solana-system-program", - "solana-version", - "solana-vote", - "solana-vote-program", - "solana-zk-token-proof-program", - "solana-zk-token-sdk", - "static_assertions", - "strum", - "strum_macros", - "symlink", - "tar", - "tempfile", - "test-case", - "thiserror", - "zstd", -] - -[[package]] -name = "solana-sdk" -version = "1.17.28" -dependencies = [ - "anyhow", - "assert_matches", - "base64 0.21.4", - "bincode", - "bitflags 2.3.3", - "borsh 0.10.3", - "bs58", - "bytemuck", - "byteorder", - "chrono", - "curve25519-dalek", - "derivation-path", - "digest 0.10.7", - "ed25519-dalek", - "ed25519-dalek-bip32", - "generic-array 0.14.7", - "hex", - "hmac 0.12.1", - "itertools", - "js-sys", - "lazy_static", - "libsecp256k1", - "log", - "memmap2", - "num-derive 0.3.3", - "num-traits", - "num_enum 0.6.1", - "pbkdf2 0.11.0", - "qstring", - "qualifier_attr", - "rand 0.7.3", - "rand 0.8.5", - "rustc_version 0.4.0", - "rustversion", - "serde", - "serde_bytes", - "serde_derive", - "serde_json", - "serde_with", - "sha2 0.10.8", - "sha3 0.10.4", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-logger", - "solana-program", - "solana-sdk", - "solana-sdk-macro", - "static_assertions", - "thiserror", - "tiny-bip39", - "uriparse", - "wasm-bindgen", -] - -[[package]] -name = "solana-sdk-macro" -version = "1.17.28" -dependencies = [ - "bs58", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.38", -] - -[[package]] -name = "solana-security-txt" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" - -[[package]] -name = "solana-send-transaction-service" -version = "1.17.28" -dependencies = [ - "crossbeam-channel", - "log", - "solana-client", - "solana-logger", - "solana-measure", - "solana-metrics", - "solana-runtime", - "solana-sdk", - "solana-tpu-client", -] - -[[package]] -name = "solana-stake-accounts" -version = "1.17.28" -dependencies = [ - "clap 2.33.3", - "solana-clap-utils", - "solana-cli-config", - "solana-remote-wallet", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-runtime", - "solana-sdk", - "solana-stake-program", - "solana-version", -] - -[[package]] -name = "solana-stake-program" -version = "1.17.28" -dependencies = [ - "assert_matches", - "bincode", - "log", - "proptest", - "rustc_version 0.4.0", - "solana-config-program", - "solana-logger", - "solana-program-runtime", - "solana-sdk", - "solana-vote-program", - "test-case", -] - -[[package]] -name = "solana-storage-bigtable" -version = "1.17.28" -dependencies = [ - "backoff", - "bincode", - "bytes", - "bzip2", - "enum-iterator", - "flate2", - "futures 0.3.28", - "goauth", - "http", - "hyper", - "hyper-proxy", - "log", - "openssl", - "prost", - "prost-types", - "serde", - "serde_derive", - "smpl_jwt", - "solana-metrics", - "solana-sdk", - "solana-storage-proto", - "solana-transaction-status", - "thiserror", - "tokio", - "tonic", - "zstd", -] - -[[package]] -name = "solana-storage-proto" -version = "1.17.28" -dependencies = [ - "bincode", - "bs58", - "enum-iterator", - "prost", - "protobuf-src", - "serde", - "solana-account-decoder", - "solana-sdk", - "solana-transaction-status", - "tonic-build", -] - -[[package]] -name = "solana-store-tool" -version = "1.17.28" -dependencies = [ - "clap 2.33.3", - "log", - "solana-accounts-db", - "solana-logger", - "solana-sdk", - "solana-version", -] - -[[package]] -name = "solana-streamer" -version = "1.17.28" -dependencies = [ - "assert_matches", - "async-channel", - "bytes", - "crossbeam-channel", - "futures-util", - "histogram", - "indexmap 2.0.2", - "itertools", - "libc", - "log", - "nix 0.26.4", - "pem", - "percentage", - "pkcs8", - "quinn", - "quinn-proto", - "rand 0.8.5", - "rcgen", - "rustls", - "solana-logger", - "solana-metrics", - "solana-perf", - "solana-sdk", - "thiserror", - "tokio", - "x509-parser", -] - -[[package]] -name = "solana-system-program" -version = "1.17.28" -dependencies = [ - "assert_matches", - "bincode", - "log", - "serde", - "serde_derive", - "solana-logger", - "solana-program-runtime", - "solana-sdk", -] - -[[package]] -name = "solana-test-validator" -version = "1.17.28" -dependencies = [ - "base64 0.21.4", - "bincode", - "crossbeam-channel", - "log", - "serde_derive", - "serde_json", - "solana-accounts-db", - "solana-cli-output", - "solana-client", - "solana-core", - "solana-geyser-plugin-manager", - "solana-gossip", - "solana-ledger", - "solana-logger", - "solana-net-utils", - "solana-program-runtime", - "solana-program-test", - "solana-rpc", - "solana-rpc-client", - "solana-runtime", - "solana-sdk", - "solana-streamer", - "solana-tpu-client", - "tokio", -] - -[[package]] -name = "solana-thin-client" -version = "1.17.28" -dependencies = [ - "bincode", - "log", - "rayon", - "solana-connection-cache", - "solana-logger", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-sdk", -] - -[[package]] -name = "solana-tokens" -version = "1.17.28" -dependencies = [ - "assert_matches", - "bincode", - "chrono", - "clap 2.33.3", - "console", - "csv", - "ctrlc", - "indexmap 2.0.2", - "indicatif", - "pickledb", - "serde", - "solana-account-decoder", - "solana-clap-utils", - "solana-cli-config", - "solana-logger", - "solana-remote-wallet", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-sdk", - "solana-streamer", - "solana-test-validator", - "solana-transaction-status", - "solana-version", - "spl-associated-token-account", - "spl-token", - "tempfile", - "thiserror", -] - -[[package]] -name = "solana-tpu-client" -version = "1.17.28" -dependencies = [ - "async-trait", - "bincode", - "futures-util", - "indexmap 2.0.2", - "indicatif", - "log", - "rayon", - "solana-connection-cache", - "solana-measure", - "solana-metrics", - "solana-pubsub-client", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-sdk", - "thiserror", - "tokio", -] - -[[package]] -name = "solana-transaction-dos" -version = "1.17.28" -dependencies = [ - "bincode", - "clap 2.33.3", - "log", - "rand 0.8.5", - "rayon", - "solana-clap-utils", - "solana-cli", - "solana-client", - "solana-core", - "solana-faucet", - "solana-gossip", - "solana-local-cluster", - "solana-logger", - "solana-measure", - "solana-net-utils", - "solana-rpc-client", - "solana-runtime", - "solana-sdk", - "solana-streamer", - "solana-transaction-status", - "solana-version", -] - -[[package]] -name = "solana-transaction-status" -version = "1.17.28" -dependencies = [ - "Inflector", - "base64 0.21.4", - "bincode", - "borsh 0.10.3", - "bs58", - "lazy_static", - "log", - "serde", - "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-sdk", - "spl-associated-token-account", - "spl-memo", - "spl-token", - "spl-token-2022", - "thiserror", -] - -[[package]] -name = "solana-turbine" -version = "1.17.28" -dependencies = [ - "assert_matches", - "bincode", - "bytes", - "crossbeam-channel", - "futures 0.3.28", - "itertools", - "log", - "lru", - "quinn", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rayon", - "rcgen", - "rustls", - "solana-entry", - "solana-gossip", - "solana-ledger", - "solana-logger", - "solana-measure", - "solana-metrics", - "solana-perf", - "solana-poh", - "solana-quic-client", - "solana-rayon-threadlimit", - "solana-rpc", - "solana-rpc-client-api", - "solana-runtime", - "solana-sdk", - "solana-streamer", - "thiserror", - "tokio", -] - -[[package]] -name = "solana-udp-client" -version = "1.17.28" -dependencies = [ - "async-trait", - "solana-connection-cache", - "solana-net-utils", - "solana-sdk", - "solana-streamer", - "thiserror", - "tokio", -] - -[[package]] -name = "solana-upload-perf" -version = "1.17.28" -dependencies = [ - "serde_json", - "solana-metrics", -] - -[[package]] -name = "solana-validator" -version = "1.17.28" -dependencies = [ - "chrono", - "clap 2.33.3", - "console", - "core_affinity", - "crossbeam-channel", - "fd-lock", - "indicatif", - "itertools", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "jsonrpc-ipc-server", - "jsonrpc-server-utils", - "lazy_static", - "libc", - "libloading", - "log", - "num_cpus", - "rand 0.8.5", - "rayon", - "serde", - "serde_json", - "serde_yaml 0.9.25", - "signal-hook", - "solana-account-decoder", - "solana-accounts-db", - "solana-clap-utils", - "solana-cli-config", - "solana-core", - "solana-download-utils", - "solana-entry", - "solana-faucet", - "solana-genesis-utils", - "solana-geyser-plugin-interface", - "solana-geyser-plugin-manager", - "solana-gossip", - "solana-ledger", - "solana-logger", - "solana-metrics", - "solana-net-utils", - "solana-perf", - "solana-poh", - "solana-rpc", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-runtime", - "solana-sdk", - "solana-send-transaction-service", - "solana-storage-bigtable", - "solana-streamer", - "solana-test-validator", - "solana-tpu-client", - "solana-version", - "solana-vote-program", - "spl-token-2022", - "symlink", - "thiserror", - "tikv-jemallocator", -] - -[[package]] -name = "solana-version" -version = "1.17.28" -dependencies = [ - "log", - "rustc_version 0.4.0", - "semver 1.0.20", - "serde", - "serde_derive", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-sdk", -] - -[[package]] -name = "solana-vote" -version = "1.17.28" -dependencies = [ - "bincode", - "crossbeam-channel", - "itertools", - "log", - "rand 0.8.5", - "rustc_version 0.4.0", - "serde", - "serde_derive", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-sdk", - "solana-vote-program", - "thiserror", -] - -[[package]] -name = "solana-vote-program" -version = "1.17.28" -dependencies = [ - "assert_matches", - "bincode", - "log", - "num-derive 0.3.3", - "num-traits", - "rustc_version 0.4.0", - "serde", - "serde_derive", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-logger", - "solana-metrics", - "solana-program", - "solana-program-runtime", - "solana-sdk", - "test-case", - "thiserror", -] - -[[package]] -name = "solana-watchtower" -version = "1.17.28" -dependencies = [ - "clap 2.33.3", - "humantime", - "log", - "solana-clap-utils", - "solana-cli-config", - "solana-cli-output", - "solana-logger", - "solana-metrics", - "solana-notifier", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-sdk", - "solana-version", -] - -[[package]] -name = "solana-zk-keygen" -version = "1.17.28" -dependencies = [ - "bs58", - "clap 3.2.23", - "dirs-next", - "num_cpus", - "solana-clap-v3-utils", - "solana-cli-config", - "solana-remote-wallet", - "solana-sdk", - "solana-version", - "solana-zk-token-sdk", - "tempfile", - "thiserror", - "tiny-bip39", -] - -[[package]] -name = "solana-zk-token-proof-program" -version = "1.17.28" -dependencies = [ - "bytemuck", - "criterion", - "curve25519-dalek", - "num-derive 0.3.3", - "num-traits", - "solana-program-runtime", - "solana-sdk", - "solana-zk-token-sdk", -] - -[[package]] -name = "solana-zk-token-proof-program-tests" -version = "1.17.28" -dependencies = [ - "bytemuck", - "curve25519-dalek", - "solana-program-runtime", - "solana-program-test", - "solana-sdk", - "solana-zk-token-sdk", -] - -[[package]] -name = "solana-zk-token-sdk" -version = "1.17.28" -dependencies = [ - "aes-gcm-siv", - "base64 0.21.4", - "bincode", - "bytemuck", - "byteorder", - "curve25519-dalek", - "getrandom 0.1.16", - "itertools", - "lazy_static", - "merlin", - "num-derive 0.3.3", - "num-traits", - "rand 0.7.3", - "serde", - "serde_json", - "sha3 0.9.1", - "solana-program", - "solana-sdk", - "subtle", - "thiserror", - "tiny-bip39", - "zeroize", -] - -[[package]] -name = "solana_rbpf" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d457cc2ba742c120492a64b7fa60e22c575e891f6b55039f4d736568fb112a3" -dependencies = [ - "byteorder", - "combine", - "gdbstub", - "goblin", - "hash32", - "libc", - "log", - "rand 0.8.5", - "rustc-demangle", - "scroll", - "thiserror", - "winapi 0.3.9", -] - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "511254be0c5bcf062b019a6c89c01a664aa359ded62f78aa72c6fc137c0590e5" - -[[package]] -name = "spki" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" -dependencies = [ - "base64ct", - "der", -] - -[[package]] -name = "spl-associated-token-account" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "992d9c64c2564cc8f63a4b508bf3ebcdf2254b0429b13cd1d31adb6162432a5f" -dependencies = [ - "assert_matches", - "borsh 0.10.3", - "num-derive 0.4.1", - "num-traits", - "solana-program", - "spl-token", - "spl-token-2022", - "thiserror", -] - -[[package]] -name = "spl-discriminator" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce5d563b58ef1bb2cdbbfe0dfb9ffdc24903b10ae6a4df2d8f425ece375033f" -dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator-derive", -] - -[[package]] -name = "spl-discriminator-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fadbefec4f3c678215ca72bd71862697bb06b41fd77c0088902dd3203354387b" -dependencies = [ - "quote", - "spl-discriminator-syn", - "syn 2.0.38", -] - -[[package]] -name = "spl-discriminator-syn" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e5f2044ca42c8938d54d1255ce599c79a1ffd86b677dfab695caa20f9ffc3f2" -dependencies = [ - "proc-macro2", - "quote", - "sha2 0.10.8", - "syn 2.0.38", - "thiserror", -] - -[[package]] -name = "spl-instruction-padding" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c5557ec281a34f7f9053feb6e0d795162ba0c6a52898b21c3d1e899481191d5" -dependencies = [ - "num_enum 0.5.11", - "solana-program", -] - -[[package]] -name = "spl-memo" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f180b03318c3dbab3ef4e1e4d46d5211ae3c780940dd0a28695aba4b59a75a" -dependencies = [ - "solana-program", -] - -[[package]] -name = "spl-pod" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2881dddfca792737c0706fa0175345ab282b1b0879c7d877bad129645737c079" -dependencies = [ - "borsh 0.10.3", - "bytemuck", - "solana-program", - "solana-zk-token-sdk", - "spl-program-error", -] - -[[package]] -name = "spl-program-error" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "249e0318493b6bcf27ae9902600566c689b7dfba9f1bdff5893e92253374e78c" -dependencies = [ - "num-derive 0.4.1", - "num-traits", - "solana-program", - "spl-program-error-derive", - "thiserror", -] - -[[package]] -name = "spl-program-error-derive" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5269c8e868da17b6552ef35a51355a017bd8e0eae269c201fef830d35fa52c" -dependencies = [ - "proc-macro2", - "quote", - "sha2 0.10.8", - "syn 2.0.38", -] - -[[package]] -name = "spl-tlv-account-resolution" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f7020347c07892c08560d230fbb8a980316c9e198e22b198b7b9d951ff96047" -dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", - "spl-type-length-value", -] - -[[package]] -name = "spl-token" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08459ba1b8f7c1020b4582c4edf0f5c7511a5e099a7a97570c9698d4f2337060" -dependencies = [ - "arrayref", - "bytemuck", - "num-derive 0.3.3", - "num-traits", - "num_enum 0.6.1", - "solana-program", - "thiserror", -] - -[[package]] -name = "spl-token-2022" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d697fac19fd74ff472dfcc13f0b442dd71403178ce1de7b5d16f83a33561c059" -dependencies = [ - "arrayref", - "bytemuck", - "num-derive 0.4.1", - "num-traits", - "num_enum 0.7.1", - "solana-program", - "solana-security-txt", - "solana-zk-token-sdk", - "spl-memo", - "spl-pod", - "spl-token", - "spl-token-group-interface", - "spl-token-metadata-interface", - "spl-transfer-hook-interface", - "spl-type-length-value", - "thiserror", -] - -[[package]] -name = "spl-token-group-interface" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b889509d49fa74a4a033ca5dae6c2307e9e918122d97e58562f5c4ffa795c75d" -dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", -] - -[[package]] -name = "spl-token-metadata-interface" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c16ce3ba6979645fb7627aa1e435576172dd63088dc7848cb09aa331fa1fe4f" -dependencies = [ - "borsh 0.10.3", - "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", - "spl-type-length-value", -] - -[[package]] -name = "spl-transfer-hook-interface" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aabdb7c471566f6ddcee724beb8618449ea24b399e58d464d6b5bc7db550259" -dependencies = [ - "arrayref", - "bytemuck", - "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", - "spl-tlv-account-resolution", - "spl-type-length-value", -] - -[[package]] -name = "spl-type-length-value" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a468e6f6371f9c69aae760186ea9f1a01c2908351b06a5e0026d21cfc4d7ecac" -dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "stream-cancel" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0a9eb2715209fb8cc0d942fcdff45674bfc9f0090a0d897e85a22955ad159b" -dependencies = [ - "futures-core", - "pin-project", - "tokio", -] - -[[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.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96acfc1b70604b8b2f1ffa4c57e59176c7dbb05d556c71ecd2f5498a1dee7f8" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", -] - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "symlink" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7973cce6668464ea31f176d85b13c7ab3bba2cb3b77a2ed26abd7801688010a" - -[[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 = "sync_wrapper" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" - -[[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 = "sys-info" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b3a0d0aba8bf96a0e1ddfdc352fc53b3df7f39318c71854910c3c4b024ae52c" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "sysctl" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225e483f02d0ad107168dc57381a8a40c3aeea6abe47f37506931f861643cfa8" -dependencies = [ - "bitflags 1.3.2", - "byteorder", - "libc", - "thiserror", - "walkdir", -] - -[[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 = "systemstat" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24aec24a9312c83999a28e3ef9db7e2afd5c64bf47725b758cdc1cafd5b0bd2" -dependencies = [ - "bytesize", - "lazy_static", - "libc", - "nom", - "time", - "winapi 0.3.9", -] - -[[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 = "tarpc" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38a012bed6fb9681d3bf71ffaa4f88f3b4b9ed3198cda6e4c8462d24d4bb80" -dependencies = [ - "anyhow", - "fnv", - "futures 0.3.28", - "humantime", - "opentelemetry", - "pin-project", - "rand 0.8.5", - "serde", - "static_assertions", - "tarpc-plugins", - "thiserror", - "tokio", - "tokio-serde", - "tokio-util 0.6.9", - "tracing", - "tracing-opentelemetry", -] - -[[package]] -name = "tarpc-plugins" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee42b4e559f17bce0385ebf511a7beb67d5cc33c12c96b7f4e9789919d9c10f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "tempfile" -version = "3.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" -dependencies = [ - "cfg-if 1.0.0", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "termcolor" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "termtree" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16" - -[[package]] -name = "test-case" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8f1e820b7f1d95a0cdbf97a5df9de10e1be731983ab943e56703ac1b8e9d425" -dependencies = [ - "test-case-macros", -] - -[[package]] -name = "test-case-core" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c25e2cb8f5fcd7318157634e8838aa6f7e4715c96637f969fabaccd1ef5462" -dependencies = [ - "cfg-if 1.0.0", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "test-case-macros" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37cfd7bbc88a0104e304229fba519bdc45501a30b760fb72240342f1289ad257" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.38", - "test-case-core", -] - -[[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.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - -[[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-scoped" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcbb6aa301e5d3b0b5ef639c9a9c7e2f1c944f177b460c04dc24c69b1fa2bd99" - -[[package]] -name = "thread_local" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" -dependencies = [ - "once_cell", -] - -[[package]] -name = "tikv-jemalloc-sys" -version = "0.4.2+5.2.1-patched.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5844e429d797c62945a566f8da4e24c7fe3fbd5d6617fd8bf7a0b7dc1ee0f22e" -dependencies = [ - "cc", - "fs_extra", - "libc", -] - -[[package]] -name = "tikv-jemallocator" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c14a5a604eb8715bc5785018a37d00739b180bcf609916ddf4393d33d49ccdf" -dependencies = [ - "libc", - "tikv-jemalloc-sys", -] - -[[package]] -name = "time" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" -dependencies = [ - "itoa", - "libc", - "num_threads", - "time-macros", -] - -[[package]] -name = "time-macros" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" - -[[package]] -name = "tiny-bip39" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d" -dependencies = [ - "anyhow", - "hmac 0.8.1", - "once_cell", - "pbkdf2 0.4.0", - "rand 0.7.3", - "rustc-hash", - "sha2 0.9.9", - "thiserror", - "unicode-normalization", - "wasm-bindgen", - "zeroize", -] - -[[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.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7" -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.29.1" -source = "git+https://github.com/solana-labs/solana-tokio.git?rev=7cf47705faacf7bf0e43e4131a5377b3291fce21#7cf47705faacf7bf0e43e4131a5377b3291fce21" -dependencies = [ - "autocfg", - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "parking_lot 0.12.1", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.4.9", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-io-timeout" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90c49f106be240de154571dd31fbe48acb10ba6c6dd6f6517ad603abffa42de9" -dependencies = [ - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-macros" -version = "2.1.0" -source = "git+https://github.com/solana-labs/solana-tokio.git?rev=7cf47705faacf7bf0e43e4131a5377b3291fce21#7cf47705faacf7bf0e43e4131a5377b3291fce21" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[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-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls", - "tokio", -] - -[[package]] -name = "tokio-serde" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "911a61637386b789af998ee23f50aa30d5fd7edcec8d6d3dedae5e5815205466" -dependencies = [ - "bincode", - "bytes", - "educe", - "futures-core", - "futures-sink", - "pin-project", - "serde", - "serde_json", -] - -[[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-tungstenite" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" -dependencies = [ - "futures-util", - "log", - "rustls", - "tokio", - "tokio-rustls", - "tungstenite", - "webpki-roots 0.25.2", -] - -[[package]] -name = "tokio-util" -version = "0.6.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" -dependencies = [ - "bytes", - "futures-core", - "futures-io", - "futures-sink", - "log", - "pin-project-lite", - "slab", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" -dependencies = [ - "serde", -] - -[[package]] -name = "tonic" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" -dependencies = [ - "async-stream", - "async-trait", - "axum", - "base64 0.21.4", - "bytes", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-timeout", - "percent-encoding 2.3.0", - "pin-project", - "prost", - "rustls-pemfile 1.0.0", - "tokio", - "tokio-rustls", - "tokio-stream", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tonic-build" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07" -dependencies = [ - "prettyplease 0.1.9", - "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 1.9.3", - "pin-project", - "pin-project-lite", - "rand 0.8.5", - "slab", - "tokio", - "tokio-util 0.7.1", - "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.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-opentelemetry" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f9378e96a9361190ae297e7f3a8ff644aacd2897f244b1ff81f381669196fa6" -dependencies = [ - "opentelemetry", - "tracing", - "tracing-core", - "tracing-subscriber", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5312f325fe3588e277415f5a6cca1f4ccad0f248c4cd5a4bd33032d7286abc22" -dependencies = [ - "sharded-slab", - "thread_local", - "tracing-core", -] - -[[package]] -name = "trees" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de5f738ceab88e2491a94ddc33c3feeadfa95fedc60363ef110845df12f3878" - -[[package]] -name = "try-lock" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" - -[[package]] -name = "tungstenite" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "rand 0.8.5", - "rustls", - "sha1", - "thiserror", - "url 2.4.1", - "utf-8", - "webpki-roots 0.24.0", -] - -[[package]] -name = "typenum" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" - -[[package]] -name = "ucd-trie" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" - -[[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-width" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - -[[package]] -name = "universal-hash" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" -dependencies = [ - "generic-array 0.14.7", - "subtle", -] - -[[package]] -name = "unreachable" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" -dependencies = [ - "void", -] - -[[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 = "uriparse" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0200d0fc04d809396c2ad43f3c95da3582a2556eba8d453c1087f4120ee352ff" -dependencies = [ - "fnv", - "lazy_static", -] - -[[package]] -name = "url" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -dependencies = [ - "idna 0.1.5", - "matches", - "percent-encoding 1.0.1", -] - -[[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 2.3.0", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8-width" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cf7d77f457ef8dfa11e4cd5933c5ddb5dc52a94664071951219a97710f0a32b" - -[[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 = "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.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 = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[package]] -name = "walkdir" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" -dependencies = [ - "same-file", - "winapi 0.3.9", - "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.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 1.0.0", - "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-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.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 = "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 = "webpki-roots" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" -dependencies = [ - "rustls-webpki", -] - -[[package]] -name = "webpki-roots" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" - -[[package]] -name = "which" -version = "4.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea187a8ef279bc014ec368c27a920da2024d2a711109bfbe3440585d5cf27ad9" -dependencies = [ - "either", - "lazy_static", - "libc", -] - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -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-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 = "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 = "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 = "xattr" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" -dependencies = [ - "libc", -] - -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "yasna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346d34a236c9d3e5f3b9b74563f238f955bbd05fa0b8b4efa53c130c43982f4c" -dependencies = [ - "time", -] - -[[package]] -name = "zerocopy" -version = "0.7.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[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.38", -] - -[[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "5.0.1+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c12659121420dd6365c5c3de4901f97145b79651fb1d25814020ed2ed0585ae" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.1+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" -dependencies = [ - "cc", - "libc", -] diff --git a/pkgs/applications/blockchains/solana-validator/default.nix b/pkgs/applications/blockchains/solana-validator/default.nix deleted file mode 100644 index ffd6ec7243703..0000000000000 --- a/pkgs/applications/blockchains/solana-validator/default.nix +++ /dev/null @@ -1,131 +0,0 @@ -# largely inspired from https://github.com/saber-hq/saber-overlay/blob/master/packages/solana/solana.nix - -{ - stdenv, - fetchFromGitHub, - lib, - rustPlatform, - pkg-config, - darwin, - udev, - zlib, - protobuf, - openssl, - libcxx, - rocksdb_8_3, - rustfmt, - perl, - hidapi, - solanaPkgs ? - [ - "solana" - "solana-bench-tps" - "solana-faucet" - "solana-gossip" - "solana-install" - "solana-keygen" - "solana-ledger-tool" - "solana-log-analyzer" - "solana-net-shaper" - "solana-validator" - "cargo-build-bpf" - "cargo-test-bpf" - "solana-dos" - "solana-install-init" - "solana-stake-accounts" - "solana-test-validator" - "solana-tokens" - "solana-watchtower" - ] - ++ [ - # XXX: Ensure `solana-genesis` is built LAST! - # See https://github.com/solana-labs/solana/issues/5826 - "solana-genesis" - ], -}: -let - pinData = lib.importJSON ./pin.json; - version = pinData.version; - hash = pinData.hash; - rocksdb = rocksdb_8_3; - inherit (darwin.apple_sdk_11_0) Libsystem; - inherit (darwin.apple_sdk_11_0.frameworks) - System - IOKit - AppKit - Security - ; -in -rustPlatform.buildRustPackage rec { - pname = "solana-validator"; - inherit version; - - src = fetchFromGitHub { - owner = "solana-labs"; - repo = "solana"; - rev = "v${version}"; - inherit hash; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "crossbeam-epoch-0.9.5" = "sha256-Jf0RarsgJiXiZ+ddy0vp4jQ59J9m0k3sgXhWhCdhgws="; - "tokio-1.29.1" = "sha256-Z/kewMCqkPVTXdoBcSaFKG5GSQAdkdpj3mAzLLCjjGk="; - }; - }; - - cargoBuildFlags = builtins.map (n: "--bin=${n}") solanaPkgs; - - # weird errors. see https://github.com/NixOS/nixpkgs/issues/52447#issuecomment-852079285 - # LLVM_CONFIG_PATH = "${llvm}/bin/llvm-config"; - - nativeBuildInputs = [ - pkg-config - protobuf - rustfmt - perl - rustPlatform.bindgenHook - ]; - buildInputs = - [ - openssl - zlib - hidapi - ] - ++ (lib.optionals stdenv.hostPlatform.isLinux [ udev ]) - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - System - Libsystem - libcxx - ]; - strictDeps = true; - - doCheck = false; - - env = - { - # Used by build.rs in the rocksdb-sys crate. If we don't set these, it would - # try to build RocksDB from source. - ROCKSDB_LIB_DIR = "${lib.getLib rocksdb}/lib"; - - # If set, always finds OpenSSL in the system, even if the vendored feature is enabled. - OPENSSL_NO_VENDOR = "1"; - } - // lib.optionalAttrs stdenv.hostPlatform.isDarwin { - # Require this on darwin otherwise the compiler starts rambling about missing - # cmath functions - CPPFLAGS = "-isystem ${lib.getDev libcxx}/include/c++/v1"; - LDFLAGS = "-L${lib.getLib libcxx}/lib"; - }; - - meta = with lib; { - description = "Web-Scale Blockchain for fast, secure, scalable, decentralized apps and marketplaces."; - homepage = "https://solana.com"; - license = licenses.asl20; - maintainers = with maintainers; [ adjacentresearch ]; - platforms = platforms.unix; - }; - passthru.updateScript = ./update.sh; -} diff --git a/pkgs/applications/blockchains/solana-validator/pin.json b/pkgs/applications/blockchains/solana-validator/pin.json deleted file mode 100644 index ba22a0f7baf90..0000000000000 --- a/pkgs/applications/blockchains/solana-validator/pin.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "version": "1.17.28", - "hash": "sha256-y79zsUfYsX377ofsFSg9a2il99uJsA+qdCu3J+EU5nQ=" -} diff --git a/pkgs/applications/blockchains/solana-validator/update.sh b/pkgs/applications/blockchains/solana-validator/update.sh deleted file mode 100755 index cb8aa43ac61ee..0000000000000 --- a/pkgs/applications/blockchains/solana-validator/update.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i oil -p jq moreutils nix-prefetch-github gnused - -# TODO set to `verbose` or `extdebug` once implemented in oil -shopt --set xtrace -# we need failures inside of command subs to get the correct cargoHash -shopt --unset inherit_errexit - -const directory = $(dirname $0 | xargs realpath) -const owner = "solana-labs" -const repo = "solana" -const latest_rev = $(curl -q https://api.github.com/repos/${owner}/${repo}/releases/latest | \ - jq -r '.tag_name') -const latest_version = $(echo ${latest_rev#v}) -const current_version = $(jq -r '.version' $directory/pin.json) -if ("$latest_version" === "$current_version") { - echo "solana is already up-to-date" - return 0 -} else { - const tarball_meta = $(nix-prefetch-github $owner $repo --rev "$latest_rev") - const tarball_hash = $(echo $tarball_meta | jq -r '.hash') - - jq ".version = \"$latest_version\" | \ - .\"hash\" = \"$tarball_hash\" | \ - .\"cargoHash\" = \"\"" $directory/pin.json | sponge $directory/pin.json - - const new_cargo_hash = $(nix-build -A solana-validator 2>&1 | \ - tail -n 2 | \ - head -n 1 | \ - sed 's/\s*got:\s*//') - - jq ".cargoHash = \"$new_cargo_hash\"" $directory/pin.json | sponge $directory/pin.json -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 46fb6da427e82..71c8187730ee3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1206,6 +1206,7 @@ mapAliases { source-han-serif-traditional-chinese = source-han-serif; + solana-validator = throw "'solana-validator' is obsoleted by solana-cli, which also includes the validator binary"; # Added 2024-12-20 spectral = throw "'spectral' has been renamed to/replaced by 'neochat'"; # Converted to throw 2024-10-17 # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell spidermonkey = throw "'spidermonkey' has been renamed to/replaced by 'spidermonkey_78'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b267d0432be2..319f4e6bbece1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16414,8 +16414,6 @@ with pkgs; pycoin = with python3Packages; toPythonApplication pycoin; - solana-validator = callPackage ../applications/blockchains/solana-validator { }; - snarkos = callPackage ../applications/blockchains/snarkos { inherit (darwin.apple_sdk.frameworks) Security; }; From 397f354d373cc342fea4de260ea9453c81101ad0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 11:37:38 +0000 Subject: [PATCH 103/146] waagent: 2.12.0.2 -> 2.12.0.4 --- pkgs/by-name/wa/waagent/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/waagent/package.nix b/pkgs/by-name/wa/waagent/package.nix index 66b38f8d7a279..ab490373aaa53 100644 --- a/pkgs/by-name/wa/waagent/package.nix +++ b/pkgs/by-name/wa/waagent/package.nix @@ -14,12 +14,12 @@ let in python.pkgs.buildPythonApplication rec { pname = "waagent"; - version = "2.12.0.2"; + version = "2.12.0.4"; src = fetchFromGitHub { owner = "Azure"; repo = "WALinuxAgent"; rev = "refs/tags/v${version}"; - hash = "sha256-pp54J3x/+hkG4p7X1cojupdhjc0pyKcBRnE5ejd5ZpU="; + hash = "sha256-L8W/ijBHkNukM2G9HBRVx2wFXzgkR8gbFBljNVPs6xA="; }; patches = [ # Suppress the following error when waagent tries to configure sshd: From 5e8cef0ba4ccbc3ba7d88e04e5be6615da06b7ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 12:32:57 +0000 Subject: [PATCH 104/146] python312Packages.pixel-font-knife: 0.0.7 -> 0.0.10 --- pkgs/development/python-modules/pixel-font-knife/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pixel-font-knife/default.nix b/pkgs/development/python-modules/pixel-font-knife/default.nix index 25f80ea041cd2..e5cd443ff59b2 100644 --- a/pkgs/development/python-modules/pixel-font-knife/default.nix +++ b/pkgs/development/python-modules/pixel-font-knife/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pixel-font-knife"; - version = "0.0.7"; + version = "0.0.10"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pixel_font_knife"; inherit version; - hash = "sha256-NALIf8DbIPKmazF669LHsKuP0tndR0pbphrhlXt6wyA="; + hash = "sha256-kgr9j/i8Z7U4KvjQMoZp5JaWMlSYwuhaFMmvEktNw8w="; }; build-system = [ hatchling ]; From 118957967b299675aad64c38362b1eaa816f5a58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 12:55:47 +0000 Subject: [PATCH 105/146] prometheus-smartctl-exporter: 0.12.0 -> 0.13.0 --- pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix b/pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix index 75fdd328cbcfc..e8386356da63b 100644 --- a/pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "smartctl_exporter"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QQoWAsnE/7ifvgEfQJ6cbzmwOrE7oe2zalTbu/P7r18="; + hash = "sha256-0WppsqDl4nKa6s/dyX9zsUzoqAgStDSBWMM0eolTPdk="; }; - vendorHash = "sha256-WUB2FgBl4Tybz7T0yvcSYIlG75NEhXpn1F0yuB9F21g="; + vendorHash = "sha256-Sy/lm55NAhYDdVLli5yQpoRVieJU8RJDRFzd4Len6eg="; postPatch = '' substituteInPlace main.go README.md \ From f6c5f22e4b8595476c45cfd19808a1d08d205b65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 12:58:02 +0000 Subject: [PATCH 106/146] go-camo: 2.6.0 -> 2.6.1 --- pkgs/by-name/go/go-camo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/go-camo/package.nix b/pkgs/by-name/go/go-camo/package.nix index 7c9c331ccbdc5..55ae97fc3bed6 100644 --- a/pkgs/by-name/go/go-camo/package.nix +++ b/pkgs/by-name/go/go-camo/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "go-camo"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "cactus"; repo = pname; rev = "v${version}"; - hash = "sha256-2iclQVkj813xW9Ff3yh5dxCun0LxsPn4YpSLeMwsNbY="; + hash = "sha256-916XMmSRopudpLVKSBVp415nGkRCGkkunvQZiR46aSU="; }; - vendorHash = "sha256-GbBFGbNxsijcUIogjSv8RcIQn6VQ+j21Qlm9eQWzTtc="; + vendorHash = "sha256-IYXVc6SkhayYtHKbojHrQSaCQlt3E+nwrZ4sR/fuV0Y="; ldflags = [ "-s" From 6b60271a1d7f214e5bd61b2696f0d1edd25cb754 Mon Sep 17 00:00:00 2001 From: networkException Date: Fri, 20 Dec 2024 13:58:58 +0100 Subject: [PATCH 107/146] ungoogled-chromium: 131.0.6778.139-1 -> 131.0.6778.204-1 https://chromereleases.googleblog.com/2024/12/stable-channel-update-for-desktop_18.html This update includes 5 security fixes. CVEs: CVE-2024-12692 CVE-2024-12693 CVE-2024-12694 CVE-2024-12695 --- .../networking/browsers/chromium/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index bca8407c04c25..bdee1a9a8f338 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -766,7 +766,7 @@ } }, "ungoogled-chromium": { - "version": "131.0.6778.139", + "version": "131.0.6778.204", "deps": { "depot_tools": { "rev": "20b9bdcace7ed561d6a75728c85373503473cb6b", @@ -777,16 +777,16 @@ "hash": "sha256-a8yCdBsl0nBMPS+pCLwrkAvQNP/THx/z/GySyOgx4Jk=" }, "ungoogled-patches": { - "rev": "131.0.6778.139-1", - "hash": "sha256-6ehqckNitebDNEiY9qgbk8XMLADhpayxodpSFjlUDTA=" + "rev": "131.0.6778.204-1", + "hash": "sha256-08XBobDtEuVG/tli7SXJ3Ca/aFM4kybuk043sVswPj8=" }, "npmHash": "sha256-b1l8SwjAfoColoa3zhTMPEF/rRuxzT3ATHE77rWU5EA=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "c35bbcbd7c2775a12a3f320e05ac0022939b1a8a", - "hash": "sha256-oJ4y9W51RMiUk40Uz8b3LJH0kMD5GMDG2V//Tng4/4A=", + "rev": "52183f9e99a61056f9b78535f53d256f1516f2a0", + "hash": "sha256-D7+Ji8Y1vw1Sgt9njbZDGbgbzT8eAvx/95M8SsHyiN4=", "recompress": true }, "src/third_party/clang-format/script": { @@ -1526,8 +1526,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "b97fcc24b3523da5e389d2a6d76857f134be09c5", - "hash": "sha256-5Es9Zot/DH+UKq3+aCgeQC+Llgj7/lmPXUYvar/hX7I=" + "rev": "7f72bbed40ca85a6b68ca2f15feca342c9c256d0", + "hash": "sha256-QJcC6T2IOCXhObwND0jPQTUl84lotcYRCIQe4GTtczc=" } } } From 89e894e71452a23e655654b2ed948f27fc1ddde8 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 20 Dec 2024 03:58:47 +0100 Subject: [PATCH 108/146] bottles: remove "Core" tab --- pkgs/by-name/bo/bottles-unwrapped/package.nix | 1 + .../bottles-unwrapped/remove-core-tab.patch | 76 +++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 pkgs/by-name/bo/bottles-unwrapped/remove-core-tab.patch diff --git a/pkgs/by-name/bo/bottles-unwrapped/package.nix b/pkgs/by-name/bo/bottles-unwrapped/package.nix index c1ac158369390..f8c738bd14524 100644 --- a/pkgs/by-name/bo/bottles-unwrapped/package.nix +++ b/pkgs/by-name/bo/bottles-unwrapped/package.nix @@ -44,6 +44,7 @@ python3Packages.buildPythonApplication rec { [ ./vulkan_icd.patch ./remove-flatpak-check.patch + ./remove-core-tab.patch ] ++ ( if removeWarningPopup then diff --git a/pkgs/by-name/bo/bottles-unwrapped/remove-core-tab.patch b/pkgs/by-name/bo/bottles-unwrapped/remove-core-tab.patch new file mode 100644 index 0000000000000..79e88db7dc5f1 --- /dev/null +++ b/pkgs/by-name/bo/bottles-unwrapped/remove-core-tab.patch @@ -0,0 +1,76 @@ +diff --git a/bottles/frontend/ui/preferences.blp b/bottles/frontend/ui/preferences.blp +index 9dd12a16..c1fcf649 100644 +--- a/bottles/frontend/ui/preferences.blp ++++ b/bottles/frontend/ui/preferences.blp +@@ -284,20 +284,6 @@ template $PreferencesWindow: Adw.PreferencesWindow { + } + } + +- Adw.PreferencesPage pref_core { +- icon-name: "application-x-addon-symbolic"; +- title: _("Core"); +- visible: false; +- +- Adw.PreferencesGroup list_runtimes { +- title: _("Runtime"); +- } +- +- Adw.PreferencesGroup list_winebridge { +- title: _("WineBridge"); +- } +- } +- + Adw.PreferencesPage { + icon-name: "applications-science-symbolic"; + title: _("Experiments"); +diff --git a/bottles/frontend/views/preferences.py b/bottles/frontend/views/preferences.py +index ce7ec958..f46c6e5b 100644 +--- a/bottles/frontend/views/preferences.py ++++ b/bottles/frontend/views/preferences.py +@@ -53,8 +53,6 @@ class PreferencesWindow(Adw.PreferencesWindow): + switch_steam_programs = Gtk.Template.Child() + switch_epic_games = Gtk.Template.Child() + switch_ubisoft_connect = Gtk.Template.Child() +- list_winebridge = Gtk.Template.Child() +- list_runtimes = Gtk.Template.Child() + list_runners = Gtk.Template.Child() + list_dxvk = Gtk.Template.Child() + list_vkd3d = Gtk.Template.Child() +@@ -66,7 +64,6 @@ class PreferencesWindow(Adw.PreferencesWindow): + btn_bottles_path_reset = Gtk.Template.Child() + label_bottles_path = Gtk.Template.Child() + btn_steam_proton_doc = Gtk.Template.Child() +- pref_core = Gtk.Template.Child() + + # endregion + +@@ -170,10 +167,6 @@ class PreferencesWindow(Adw.PreferencesWindow): + self.installers_stack.set_visible_child_name("installers_offline") + self.dlls_stack.set_visible_child_name("dlls_offline") + +- # populate components lists +- self.populate_runtimes_list() +- self.populate_winebridge_list() +- + RunAsync(self.ui_update) + + # connect signals +@@ -319,18 +312,6 @@ class PreferencesWindow(Adw.PreferencesWindow): + list_component.add(_entry) + self.__registry.append(_entry) + +- def populate_runtimes_list(self): +- for runtime in self.manager.supported_runtimes.items(): +- self.list_runtimes.add( +- ComponentEntry(self.window, runtime, "runtime", is_upgradable=True) +- ) +- +- def populate_winebridge_list(self): +- for bridge in self.manager.supported_winebridge.items(): +- self.list_winebridge.add( +- ComponentEntry(self.window, bridge, "winebridge", is_upgradable=True) +- ) +- + def populate_dxvk_list(self): + self.__populate_component_list( + "dxvk", self.manager.supported_dxvk, self.list_dxvk From d528192e741079873f999f6bd68d4bf070ea95f3 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 20 Dec 2024 03:59:46 +0100 Subject: [PATCH 109/146] bottles: redirect bugtracker to nixpkgs --- pkgs/by-name/bo/bottles-unwrapped/package.nix | 1 + .../bo/bottles-unwrapped/redirect-bugtracker.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/by-name/bo/bottles-unwrapped/redirect-bugtracker.patch diff --git a/pkgs/by-name/bo/bottles-unwrapped/package.nix b/pkgs/by-name/bo/bottles-unwrapped/package.nix index f8c738bd14524..2046ceea2b0b1 100644 --- a/pkgs/by-name/bo/bottles-unwrapped/package.nix +++ b/pkgs/by-name/bo/bottles-unwrapped/package.nix @@ -43,6 +43,7 @@ python3Packages.buildPythonApplication rec { patches = [ ./vulkan_icd.patch + ./redirect-bugtracker.patch ./remove-flatpak-check.patch ./remove-core-tab.patch ] diff --git a/pkgs/by-name/bo/bottles-unwrapped/redirect-bugtracker.patch b/pkgs/by-name/bo/bottles-unwrapped/redirect-bugtracker.patch new file mode 100644 index 0000000000000..e345d0de18b38 --- /dev/null +++ b/pkgs/by-name/bo/bottles-unwrapped/redirect-bugtracker.patch @@ -0,0 +1,13 @@ +diff --git a/data/com.usebottles.bottles.metainfo.xml.in.in b/data/com.usebottles.bottles.metainfo.xml.in.in +index bdda5c6e..9292df50 100644 +--- a/data/com.usebottles.bottles.metainfo.xml.in.in ++++ b/data/com.usebottles.bottles.metainfo.xml.in.in +@@ -52,7 +52,7 @@ + @APP_ID@ + + https://usebottles.com +- https://github.com/bottlesdevs/Bottles/issues ++ https://github.com/NixOS/nixpkgs/issues + https://docs.usebottles.com + https://usebottles.com/funding + https://hosted.weblate.org/engage/bottles From 3bb81bf81259ad6c0e128ad38a4703de6c838c43 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 20 Dec 2024 04:01:09 +0100 Subject: [PATCH 110/146] bottles: re-order `propagatedBuildInputs` --- pkgs/by-name/bo/bottles-unwrapped/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/bo/bottles-unwrapped/package.nix b/pkgs/by-name/bo/bottles-unwrapped/package.nix index 2046ceea2b0b1..bf57143915147 100644 --- a/pkgs/by-name/bo/bottles-unwrapped/package.nix +++ b/pkgs/by-name/bo/bottles-unwrapped/package.nix @@ -79,21 +79,21 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ - pathvalidate - pycurl pyyaml + pycurl + chardet requests - pygobject3 - patool markdown + icoextract + patool + pathvalidate fvs - pefile + orjson + pygobject3 + idna urllib3 - chardet certifi - idna - orjson - icoextract + pefile ] ++ [ cabextract From 1efb60481406c20e857d8c66aab447932b7dfb5a Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 20 Dec 2024 04:03:27 +0100 Subject: [PATCH 111/146] bottles: follow upstream deps in propagatedBuildIn puts --- pkgs/by-name/bo/bottles-unwrapped/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/bo/bottles-unwrapped/package.nix b/pkgs/by-name/bo/bottles-unwrapped/package.nix index bf57143915147..62b3b2af8ab50 100644 --- a/pkgs/by-name/bo/bottles-unwrapped/package.nix +++ b/pkgs/by-name/bo/bottles-unwrapped/package.nix @@ -89,7 +89,9 @@ python3Packages.buildPythonApplication rec { pathvalidate fvs orjson + pycairo pygobject3 + charset-normalizer idna urllib3 certifi From a040d1d1225582314214a48c2828290adebb37c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 18 Dec 2024 18:09:41 +0100 Subject: [PATCH 112/146] opentabletdriver: simpler update script --- pkgs/by-name/op/opentabletdriver/update.sh | 27 +++++----------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/op/opentabletdriver/update.sh b/pkgs/by-name/op/opentabletdriver/update.sh index 24f6ec1ffbc4f..61eac4b8b5da4 100755 --- a/pkgs/by-name/op/opentabletdriver/update.sh +++ b/pkgs/by-name/op/opentabletdriver/update.sh @@ -1,23 +1,8 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq common-updater-scripts nixfmt-rfc-style -set -eo pipefail +#!nix-shell --pure -i bash -p bash nix nix-update git cacert +set -euo pipefail -verlte() { - printf '%s\n' "$1" "$2" | sort -C -V -} - -new_version="$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/OpenTabletDriver/OpenTabletDriver/releases" | - jq -r 'map(select(.prerelease == false)) | .[0].tag_name' | - cut -c2-)" -old_version="$(nix --extra-experimental-features 'nix-command' eval --file default.nix opentabletdriver.version --raw)" - -if verlte "$new_version" "$old_version"; then - echo "Already up to date!" - [[ "${1}" != "--force" ]] && exit 0 -fi - -update-source-version opentabletdriver "$new_version" -eval "$(nix-build -A opentabletdriver.fetch-deps --no-out-link)" - -cd "$(dirname "${BASH_SOURCE[0]}")" -nixfmt deps.nix +prev_version=$(nix eval --raw -f. opentabletdriver.version) +nix-update opentabletdriver +[[ $(nix eval --raw -f. opentabletdriver.version) == "$prev_version" ]] || + "$(nix-build . -A opentabletdriver.fetch-deps --no-out-link)" From b1f3b76f521e0b319fe000a28e052f17f0bd33b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 19 Dec 2024 00:26:05 +0100 Subject: [PATCH 113/146] opentabletdriver: update disabledTests --- pkgs/by-name/op/opentabletdriver/package.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/op/opentabletdriver/package.nix b/pkgs/by-name/op/opentabletdriver/package.nix index 7293028faa14d..08b5641265d2c 100644 --- a/pkgs/by-name/op/opentabletdriver/package.nix +++ b/pkgs/by-name/op/opentabletdriver/package.nix @@ -70,17 +70,14 @@ buildDotnetModule rec { testProjectFile = "OpenTabletDriver.Tests/OpenTabletDriver.Tests.csproj"; disabledTests = [ - # Require networking - "OpenTabletDriver.Tests.PluginRepositoryTest.ExpandRepositoryTarballFork" - "OpenTabletDriver.Tests.PluginRepositoryTest.ExpandRepositoryTarball" # Require networking & unused in Linux build - "OpenTabletDriver.Tests.UpdaterTests.UpdaterBase_ProperlyChecks_Version_Async" - "OpenTabletDriver.Tests.UpdaterTests.Updater_PreventsUpdate_WhenAlreadyUpToDate_Async" - "OpenTabletDriver.Tests.UpdaterTests.Updater_AllowsReupdate_WhenInstallFailed_Async" - "OpenTabletDriver.Tests.UpdaterTests.Updater_HasUpdateReturnsFalse_During_UpdateInstall_Async" - "OpenTabletDriver.Tests.UpdaterTests.Updater_HasUpdateReturnsFalse_After_UpdateInstall_Async" - "OpenTabletDriver.Tests.UpdaterTests.Updater_Prevents_ConcurrentAndConsecutive_Updates_Async" - "OpenTabletDriver.Tests.UpdaterTests.Updater_ProperlyBackups_BinAndAppDataDirectory_Async" + "OpenTabletDriver.Tests.UpdaterTests.CheckForUpdates_Returns_Update_When_Available" + "OpenTabletDriver.Tests.UpdaterTests.Install_Throws_UpdateAlreadyInstalledException_When_AlreadyInstalled" + "OpenTabletDriver.Tests.UpdaterTests.Install_DoesNotThrow_UpdateAlreadyInstalledException_When_PreviousInstallFailed" + "OpenTabletDriver.Tests.UpdaterTests.Install_Throws_UpdateInProgressException_When_AnotherUpdate_Is_InProgress" + "OpenTabletDriver.Tests.UpdaterTests.Install_Moves_UpdatedBinaries_To_BinDirectory" + "OpenTabletDriver.Tests.UpdaterTests.Install_Moves_Only_ToBeUpdated_Binaries" + "OpenTabletDriver.Tests.UpdaterTests.Install_Copies_AppDataFiles" # Intended only to be run in continuous integration, unnecessary for functionality "OpenTabletDriver.Tests.ConfigurationTest.Configurations_DeviceIdentifier_IsNotConflicting" # Depends on processor load From 34e0981ede3ea626ca5c8ed7159d8186938c2426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 18 Dec 2024 23:44:11 +0100 Subject: [PATCH 114/146] opentabletdriver: 0.6.4.0-unstable-2024-11-25 -> 0.6.5.0 --- pkgs/by-name/op/opentabletdriver/deps.json | 5 +++++ pkgs/by-name/op/opentabletdriver/package.nix | 9 +++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/op/opentabletdriver/deps.json b/pkgs/by-name/op/opentabletdriver/deps.json index 89827461a22fe..3a9322d5d7fba 100644 --- a/pkgs/by-name/op/opentabletdriver/deps.json +++ b/pkgs/by-name/op/opentabletdriver/deps.json @@ -19,6 +19,11 @@ "version": "3.0.2", "hash": "sha256-b8LCEIZCLJdYcJXQqI3TGDmkLrmLhz84eoTq+qP5xvU=" }, + { + "pname": "DiffPlex", + "version": "1.7.2", + "hash": "sha256-Vsn81duAmPIPkR40h5bEz7hgtF5Kt5nAAGhQZrQbqxE=" + }, { "pname": "Eto.Forms", "version": "2.5.10", diff --git a/pkgs/by-name/op/opentabletdriver/package.nix b/pkgs/by-name/op/opentabletdriver/package.nix index 08b5641265d2c..34fe197a39f89 100644 --- a/pkgs/by-name/op/opentabletdriver/package.nix +++ b/pkgs/by-name/op/opentabletdriver/package.nix @@ -20,19 +20,16 @@ buildDotnetModule rec { pname = "OpenTabletDriver"; - version = "0.6.4.0-unstable-2024-11-25"; + version = "0.6.5.0"; src = fetchFromGitHub { owner = "OpenTabletDriver"; repo = "OpenTabletDriver"; - rev = "8b88b8bdc5144391f10eb61ee77803ba0ee83718"; # 0.6.x branch - hash = "sha256-5JKkSqV9owkHgWXfjiyv5QRh86apDCPzpA6qha1i4D4="; + rev = "refs/tags/v${version}"; + hash = "sha256-ILnwHfcV/tW59TLDpAeDwJK708IQfMFBOYuqRtED0kw="; }; - dotnetInstallFlags = [ "--framework=net8.0" ]; - dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.runtime_8_0; projectFile = [ "OpenTabletDriver.Console" From 212370d7553108a9786c2c3e701dedac3f542c78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 20 Dec 2024 12:59:59 +0100 Subject: [PATCH 115/146] opentabletdriver: add changelog --- pkgs/by-name/op/opentabletdriver/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/op/opentabletdriver/package.nix b/pkgs/by-name/op/opentabletdriver/package.nix index 34fe197a39f89..05a432facfe22 100644 --- a/pkgs/by-name/op/opentabletdriver/package.nix +++ b/pkgs/by-name/op/opentabletdriver/package.nix @@ -122,9 +122,11 @@ buildDotnetModule rec { }; meta = { + changelog = "https://github.com/OpenTabletDriver/OpenTabletDriver/releases/tag/v${version}"; description = "Open source, cross-platform, user-mode tablet driver"; homepage = "https://github.com/OpenTabletDriver/OpenTabletDriver"; license = lib.licenses.lgpl3Plus; + mainProgram = "otd"; maintainers = with lib.maintainers; [ gepbird thiagokokada @@ -133,6 +135,5 @@ buildDotnetModule rec { "x86_64-linux" "aarch64-linux" ]; - mainProgram = "otd"; }; } From e849f765d6dd6b929cca313f2af3ba19e7e3965d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 20 Dec 2024 13:12:25 +0100 Subject: [PATCH 116/146] opentabletdriver: move to finalAttrs --- pkgs/by-name/op/opentabletdriver/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/op/opentabletdriver/package.nix b/pkgs/by-name/op/opentabletdriver/package.nix index 05a432facfe22..05dfbe770fe78 100644 --- a/pkgs/by-name/op/opentabletdriver/package.nix +++ b/pkgs/by-name/op/opentabletdriver/package.nix @@ -18,14 +18,14 @@ wrapGAppsHook3, }: -buildDotnetModule rec { +buildDotnetModule (finalAttrs: { pname = "OpenTabletDriver"; version = "0.6.5.0"; src = fetchFromGitHub { owner = "OpenTabletDriver"; repo = "OpenTabletDriver"; - rev = "refs/tags/v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-ILnwHfcV/tW59TLDpAeDwJK708IQfMFBOYuqRtED0kw="; }; @@ -61,7 +61,7 @@ buildDotnetModule rec { udev ]; - buildInputs = runtimeDeps; + buildInputs = finalAttrs.runtimeDeps; doCheck = true; testProjectFile = "OpenTabletDriver.Tests/OpenTabletDriver.Tests.csproj"; @@ -122,7 +122,7 @@ buildDotnetModule rec { }; meta = { - changelog = "https://github.com/OpenTabletDriver/OpenTabletDriver/releases/tag/v${version}"; + changelog = "https://github.com/OpenTabletDriver/OpenTabletDriver/releases/tag/v${finalAttrs.version}"; description = "Open source, cross-platform, user-mode tablet driver"; homepage = "https://github.com/OpenTabletDriver/OpenTabletDriver"; license = lib.licenses.lgpl3Plus; @@ -136,4 +136,4 @@ buildDotnetModule rec { "aarch64-linux" ]; }; -} +}) From a1e6b47118309338f5e04917fcf800078adbcfb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 20 Dec 2024 13:21:43 +0100 Subject: [PATCH 117/146] opentabletdriver: add version checking --- pkgs/by-name/op/opentabletdriver/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/op/opentabletdriver/package.nix b/pkgs/by-name/op/opentabletdriver/package.nix index 05dfbe770fe78..fcb0461de3070 100644 --- a/pkgs/by-name/op/opentabletdriver/package.nix +++ b/pkgs/by-name/op/opentabletdriver/package.nix @@ -16,6 +16,7 @@ nixosTests, udev, wrapGAppsHook3, + versionCheckHook, }: buildDotnetModule (finalAttrs: { @@ -114,6 +115,12 @@ buildDotnetModule (finalAttrs: { }) ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/otd-daemon"; + passthru = { updateScript = ./update.sh; tests = { From 5f735946bebfcb5c9aed01389a3311d9d76124e4 Mon Sep 17 00:00:00 2001 From: Merlin Humml Date: Tue, 1 Oct 2024 07:40:58 +0200 Subject: [PATCH 118/146] clprover: move to by-name, windows and aarch compatability --- .../science/logic/clprover/clprover.nix | 28 --------- pkgs/by-name/cl/clprover/package.nix | 60 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 - 3 files changed, 60 insertions(+), 30 deletions(-) delete mode 100644 pkgs/applications/science/logic/clprover/clprover.nix create mode 100644 pkgs/by-name/cl/clprover/package.nix diff --git a/pkgs/applications/science/logic/clprover/clprover.nix b/pkgs/applications/science/logic/clprover/clprover.nix deleted file mode 100644 index 543c6cb4310bd..0000000000000 --- a/pkgs/applications/science/logic/clprover/clprover.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchzip }: - -stdenv.mkDerivation { - pname = "clprover"; - version = "1.0.3"; - - src = fetchzip { - url = "https://cgi.csc.liv.ac.uk/~ullrich/CLProver++/CLProver++-v1.0.3-18-04-2015.zip"; - sha256 = "10kmlg4m572qwfzi6hkyb0ypb643xw8sfb55xx7866lyh37w1q3s"; - stripRoot = false; - }; - - installPhase = '' - mkdir $out - cp -r bin $out/bin - mkdir -p $out/share/clprover - cp -r examples $out/share/clprover/examples - ''; - - meta = with lib; { - description = "Resolution-based theorem prover for Coalition Logic implemented in C++"; - mainProgram = "CLProver++"; - homepage = "https://cgi.csc.liv.ac.uk/~ullrich/CLProver++/"; - license = licenses.gpl3; # Note that while the website states that it is GPLv2 but the file in the zip as well as the comments in the source state it is GPLv3 - maintainers = with maintainers; [ mgttlinger ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/by-name/cl/clprover/package.nix b/pkgs/by-name/cl/clprover/package.nix new file mode 100644 index 0000000000000..ec18eb101cb48 --- /dev/null +++ b/pkgs/by-name/cl/clprover/package.nix @@ -0,0 +1,60 @@ +{ + stdenv, + lib, + fetchFromGitHub, +}: + +stdenv.mkDerivation (self: { + pname = "CLProver++"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "PaulGainer"; + repo = "CLProverPlusPlus"; + rev = "66bf6dc19d77094cc06eac3f30a3630ba830ac86"; + sha256 = "sha256-UZ5e11wGuKyVrG+7hZJY6OmN6Y1mg43xPuvXPRVNKNw="; + }; + + postPatch = '' + sed -i 's/\(TARGET_OS *:= *\)[^ ]+/\1${ + if stdenv.targetPlatform.isWindows then "WINDOWS" else "LINUX" + }/g' Makefile + sed -i 's/-m64/${ + if stdenv.targetPlatform.isAarch then + "-march=${stdenv.targetPlatform.gcc.arch}" + else if stdenv.targetPlatform.is32bit then + "-m32" + else + "-m64" + }/g' Makefile + ''; + + preBuild = '' + mkdir bin + ''; + + makeFlags = [ + "CC=${lib.getBin stdenv.cc}/bin/${stdenv.cc.targetPrefix}g++" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r bin $out/ + + mkdir -p $out/share/${self.pname} + cp -r examples $out/share/${self.pname}/examples + + runHook postInstall + ''; + + meta = { + description = "Ordered resolution based theorem prover for Coalition Logic"; + homepage = "https://cgi.csc.liv.ac.uk/~ullrich/CLProver++/"; + maintainers = with lib.maintainers; [ mgttlinger ]; + platforms = with lib.platforms; linux ++ windows; + license = lib.licenses.gpl3; + mainProgram = if stdenv.targetPlatform.isWindows then "CLProver++.exe" else "CLProver++"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16b6aa0958736..e7112a5a7dd67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2194,8 +2194,6 @@ with pkgs; clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { }; - clprover = callPackage ../applications/science/logic/clprover/clprover.nix { }; - coloredlogs = with python3Packages; toPythonApplication coloredlogs; czkawka-full = czkawka.wrapper.override { From 02682d285eb704c02b3494df40e810cd30d0575e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 13:30:18 +0000 Subject: [PATCH 119/146] kubedb-cli: 0.49.0 -> 0.50.0 --- pkgs/by-name/ku/kubedb-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ku/kubedb-cli/package.nix b/pkgs/by-name/ku/kubedb-cli/package.nix index 5fc89196dd50e..db8ff6966312b 100644 --- a/pkgs/by-name/ku/kubedb-cli/package.nix +++ b/pkgs/by-name/ku/kubedb-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.49.0"; + version = "0.50.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-7/WSc3PeeFX05xwvtwpN3sjy91gUnnC8cTeYxJOsqoM="; + sha256 = "sha256-9LHDf2la4cAnppv1yS1wUob87mjsfR7SGfuxiFtICqA="; }; vendorHash = null; From 8c76584a4cb0ebe07af52cc11df16ad10249f34a Mon Sep 17 00:00:00 2001 From: Caleb Norton Date: Fri, 20 Dec 2024 07:42:04 -0600 Subject: [PATCH 120/146] skia: enable fontconfig, freetype, and metal on darwin (#361299) --- pkgs/by-name/sk/skia/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/sk/skia/package.nix b/pkgs/by-name/sk/skia/package.nix index 6622b305e5b78..887cd8ccdcfc3 100644 --- a/pkgs/by-name/sk/skia/package.nix +++ b/pkgs/by-name/sk/skia/package.nix @@ -95,6 +95,10 @@ stdenv.mkDerivation (finalAttrs: { "libwebp" ] ++ lib.optionals enableVulkan [ "skia_use_vulkan=true" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "skia_use_fontconfig=true" + "skia_use_freetype=true" + "skia_use_metal=true" ]; env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-lz"; From 3bbabb4932e2a14c24e00175e59f8e0a69b0e4ee Mon Sep 17 00:00:00 2001 From: oddlama Date: Fri, 11 Oct 2024 03:03:16 +0200 Subject: [PATCH 121/146] actual-server: init at 24.12.0 Co-authored-by: PatrickDaG <58092422+PatrickDaG@users.noreply.github.com> --- pkgs/by-name/ac/actual-server/package.nix | 128 ++++++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 pkgs/by-name/ac/actual-server/package.nix diff --git a/pkgs/by-name/ac/actual-server/package.nix b/pkgs/by-name/ac/actual-server/package.nix new file mode 100644 index 0000000000000..1db6f742e03bf --- /dev/null +++ b/pkgs/by-name/ac/actual-server/package.nix @@ -0,0 +1,128 @@ +{ + lib, + stdenv, + stdenvNoCC, + fetchFromGitHub, + makeWrapper, + cacert, + gitMinimal, + nodejs_20, + yarn, + nixosTests, + nix-update-script, +}: +let + version = "24.12.0"; + src = fetchFromGitHub { + owner = "actualbudget"; + repo = "actual-server"; + tag = "v${version}"; + hash = "sha256-qCATfpYjDlR2LaalkF0/b5tD4HDE4aNDrLvTC4g0ctY="; + }; + + yarn_20 = yarn.override { nodejs = nodejs_20; }; + + # We cannot use fetchYarnDeps because that doesn't support yarn2/berry + # lockfiles (see https://github.com/NixOS/nixpkgs/issues/254369) + offlineCache = stdenvNoCC.mkDerivation { + name = "actual-server-${version}-offline-cache"; + inherit src; + + nativeBuildInputs = [ + cacert # needed for git + gitMinimal # needed to download git dependencies + yarn_20 + ]; + + SUPPORTED_ARCHITECTURES = builtins.toJSON { + os = [ + "darwin" + "linux" + ]; + cpu = [ + "arm" + "arm64" + "ia32" + "x64" + ]; + libc = [ + "glibc" + "musl" + ]; + }; + + buildPhase = '' + runHook preBuild + + export HOME=$(mktemp -d) + yarn config set enableTelemetry 0 + yarn config set cacheFolder $out + yarn config set --json supportedArchitectures "$SUPPORTED_ARCHITECTURES" + yarn + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r ./node_modules $out/node_modules + + runHook postInstall + ''; + dontFixup = true; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = + { + x86_64-linux = "sha256-Rz+iKw4JDWtZOrCjs9sbHVw/bErAEY4TfoG+QfGKY94="; + aarch64-linux = "sha256-JGpRoIQrEI6crczHD62ZQO08GshBbzJC0dONYD69K/I="; + aarch64-darwin = "sha256-v2qzKmtqBdU6igyHat+NyL/XTzWgq/CKlNpai/iFHyQ="; + x86_64-darwin = "sha256-0ksWLlF/a58KY/8NgOQ5aPOLoXzqDqO3lhkmFvT17Bk="; + } + .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; +in +stdenv.mkDerivation { + pname = "actual-server"; + inherit version src; + + nativeBuildInputs = [ + makeWrapper + yarn_20 + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib,lib/actual} + cp -r ${offlineCache}/node_modules/ $out/lib/actual + cp -r ./ $out/lib/actual + + makeWrapper ${lib.getExe nodejs_20} "$out/bin/actual-server" \ + --add-flags "$out/lib/actual/app.js" \ + --set NODE_PATH "$out/node_modules" + + runHook postInstall + ''; + + passthru = { + inherit offlineCache; + tests = nixosTests.actual; + passthru.updateScript = nix-update-script { }; + }; + + meta = { + changelog = "https://actualbudget.org/docs/releases"; + description = "Super fast privacy-focused app for managing your finances"; + homepage = "https://actualbudget.org/"; + mainProgram = "actual-server"; + license = lib.licenses.mit; + maintainers = [ + lib.maintainers.oddlama + lib.maintainers.patrickdag + ]; + }; +} From 93af2d0523f4b9eb77e75208cdde4205110d2997 Mon Sep 17 00:00:00 2001 From: oddlama Date: Fri, 11 Oct 2024 03:06:31 +0200 Subject: [PATCH 122/146] nixos/actual: init module and tests Co-authored-by: PatrickDaG <58092422+PatrickDaG@users.noreply.github.com> --- .../manual/release-notes/rl-2505.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/web-apps/actual.nix | 121 ++++++++++++++++++ nixos/tests/actual.nix | 18 +++ nixos/tests/all-tests.nix | 1 + 5 files changed, 143 insertions(+) create mode 100644 nixos/modules/services/web-apps/actual.nix create mode 100644 nixos/tests/actual.nix diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index bc9dde73c4a4e..7272f3ff8ecc6 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -38,6 +38,8 @@ - [nostr-rs-relay](https://git.sr.ht/~gheartsfield/nostr-rs-relay/), This is a nostr relay, written in Rust. Available as [services.nostr-rs-relay](options.html#opt-services.nostr-rs-relay.enable). +- [Actual Budget](https://actualbudget.org/), a local-first personal finance app. Available as [services.actual](#opt-services.actual.enable). + - [mqtt-exporter](https://github.com/kpetremann/mqtt-exporter/), a Prometheus exporter for exposing messages from MQTT. Available as [services.prometheus.exporters.mqtt](#opt-services.prometheus.exporters.mqtt.enable). - [Buffyboard](https://gitlab.postmarketos.org/postmarketOS/buffybox/-/tree/master/buffyboard), a framebuffer on-screen keyboard. Available as [services.buffyboard](option.html#opt-services.buffyboard). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d4db609bbd5eb..523cb4e190128 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1413,6 +1413,7 @@ ./services/video/wivrn.nix ./services/wayland/cage.nix ./services/wayland/hypridle.nix + ./services/web-apps/actual.nix ./services/web-apps/akkoma.nix ./services/web-apps/agorakit.nix ./services/web-apps/alps.nix diff --git a/nixos/modules/services/web-apps/actual.nix b/nixos/modules/services/web-apps/actual.nix new file mode 100644 index 0000000000000..af15471521f14 --- /dev/null +++ b/nixos/modules/services/web-apps/actual.nix @@ -0,0 +1,121 @@ +{ + lib, + pkgs, + config, + ... +}: +let + inherit (lib) + getExe + mkDefault + mkEnableOption + mkIf + mkOption + mkPackageOption + types + ; + + cfg = config.services.actual; + configFile = formatType.generate "config.json" cfg.settings; + dataDir = "/var/lib/actual"; + + formatType = pkgs.formats.json { }; +in +{ + options.services.actual = { + enable = mkEnableOption "actual, a privacy focused app for managing your finances"; + package = mkPackageOption pkgs "actual-server" { }; + + openFirewall = mkOption { + default = false; + type = types.bool; + description = "Whether to open the firewall for the specified port."; + }; + + settings = mkOption { + default = { }; + description = "Server settings, refer to [the documentation](https://actualbudget.org/docs/config/) for available options."; + type = types.submodule { + freeformType = formatType.type; + + options = { + hostname = mkOption { + type = types.str; + description = "The address to listen on"; + default = "::"; + }; + + port = mkOption { + type = types.port; + description = "The port to listen on"; + default = 3000; + }; + }; + + config = { + serverFiles = mkDefault "${dataDir}/server-files"; + userFiles = mkDefault "${dataDir}/user-files"; + dataDir = mkDefault dataDir; + }; + }; + }; + }; + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.settings.port ]; + + systemd.services.actual = { + description = "Actual server, a local-first personal finance app"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + environment.ACTUAL_CONFIG_PATH = configFile; + serviceConfig = { + ExecStart = getExe cfg.package; + DynamicUser = true; + User = "actual"; + Group = "actual"; + StateDirectory = "actual"; + WorkingDirectory = dataDir; + LimitNOFILE = "1048576"; + PrivateTmp = true; + PrivateDevices = true; + StateDirectoryMode = "0700"; + Restart = "always"; + + # Hardening + CapabilityBoundingSet = ""; + LockPersonality = true; + #MemoryDenyWriteExecute = true; # Leads to coredump because V8 does JIT + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + ProtectSystem = "strict"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "@pkey" + ]; + UMask = "0077"; + }; + }; + }; + + meta.maintainers = [ + lib.maintainers.oddlama + lib.maintainers.patrickdag + ]; +} diff --git a/nixos/tests/actual.nix b/nixos/tests/actual.nix new file mode 100644 index 0000000000000..b8ee303f81272 --- /dev/null +++ b/nixos/tests/actual.nix @@ -0,0 +1,18 @@ +import ./make-test-python.nix ( + { lib, ... }: + { + name = "actual"; + meta.maintainers = [ lib.maintainers.oddlama ]; + + nodes.machine = + { ... }: + { + services.actual.enable = true; + }; + + testScript = '' + machine.wait_for_open_port(3000) + machine.succeed("curl -fvvv -Ls http://localhost:3000/ | grep 'Actual'") + ''; + } +) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index afb1730955eff..a9feb13f6d12a 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -107,6 +107,7 @@ in { aaaaxy = runTest ./aaaaxy.nix; acme = runTest ./acme.nix; acme-dns = handleTest ./acme-dns.nix {}; + actual = handleTest ./actual.nix {}; adguardhome = runTest ./adguardhome.nix; aesmd = runTestOn ["x86_64-linux"] ./aesmd.nix; agate = runTest ./web-servers/agate.nix; From d6891a3d6cbb59daefa5fe6000828cf801eaecf6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 19 Dec 2024 08:09:44 +0100 Subject: [PATCH 123/146] python312Packages.faster-whisper: unstable-2024-07-26 -> 1.1.0 Diff: https://github.com/SYSTRAN/faster-whisper/compare/d57c5b40b06e59ec44240d93485a95799548af50...v1.1.0 Changelog: https://github.com/SYSTRAN/faster-whisper/releases/tag/v1.1.0 --- .../python-modules/faster-whisper/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/faster-whisper/default.nix b/pkgs/development/python-modules/faster-whisper/default.nix index 42ae02fea649c..6a8fcbc3df247 100644 --- a/pkgs/development/python-modules/faster-whisper/default.nix +++ b/pkgs/development/python-modules/faster-whisper/default.nix @@ -19,15 +19,14 @@ buildPythonPackage rec { pname = "faster-whisper"; - version = "unstable-2024-07-26"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "SYSTRAN"; repo = "faster-whisper"; - # rev = "refs/tags/v${version}"; - rev = "d57c5b40b06e59ec44240d93485a95799548af50"; - hash = "sha256-C/O+wt3dykQJmH+VsVkpQwEAdyW8goMUMKR0Z3Y7jdo="; + tag = "v${version}"; + hash = "sha256-oJBCEwTfon80XQ9XIgnRw0SLvpwX0L5jnezwG0jv3Eg="; }; build-system = [ @@ -59,7 +58,7 @@ buildPythonPackage rec { ''; meta = with lib; { - changelog = "https://github.com/SYSTRAN/faster-whisper/releases/tag/v${version}"; + changelog = "https://github.com/SYSTRAN/faster-whisper/releases/tag/${src.tag}"; description = "Faster Whisper transcription with CTranslate2"; homepage = "https://github.com/SYSTRAN/faster-whisper"; license = licenses.mit; From d31d1a9b315f4591804cfd9f0cd4299dc38fb547 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 19 Dec 2024 08:07:16 +0100 Subject: [PATCH 124/146] whisper-ctranslate2: 0.4.6 -> 0.5.1 Diff: https://github.com/Softcatala/whisper-ctranslate2/compare/refs/tags/0.4.6...0.5.1 Changelog: https://github.com/Softcatala/whisper-ctranslate2/releases/tag/0.5.1 --- pkgs/by-name/wh/whisper-ctranslate2/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wh/whisper-ctranslate2/package.nix b/pkgs/by-name/wh/whisper-ctranslate2/package.nix index 389d6f0daf0de..ade3f8c86cb8b 100644 --- a/pkgs/by-name/wh/whisper-ctranslate2/package.nix +++ b/pkgs/by-name/wh/whisper-ctranslate2/package.nix @@ -7,7 +7,7 @@ }: let pname = "whisper-ctranslate2"; - version = "0.4.6"; + version = "0.5.1"; in python3Packages.buildPythonApplication { inherit pname version; @@ -16,8 +16,8 @@ python3Packages.buildPythonApplication { src = fetchFromGitHub { owner = "Softcatala"; repo = "whisper-ctranslate2"; - rev = "refs/tags/${version}"; - hash = "sha256-sIkZIzSGqPbjg9BMkcciGFr024Pd8ohXl/NdbsxhjH0="; + tag = version; + hash = "sha256-y1xCycWUxrLwmnk6tlyag0uN0oo6DRQFeIIBw555VjY="; }; build-system = [ python3Packages.setuptools ]; From 3aba35bfd923e4644a7f11c4866f7665b8e5bfaf Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 19 Dec 2024 22:55:29 -0600 Subject: [PATCH 125/146] vimPlugins.sniprun: move to separate folder Already wasn't in generated or plugin list, had to be manually updated. Moving to callPackage in overrides with update script support. --- .../editors/vim/plugins/overrides.nix | 57 +------------- .../editors/vim/plugins/sniprun/default.nix | 77 +++++++++++++++++++ .../{patches => }/sniprun/fix-paths.patch | 0 3 files changed, 78 insertions(+), 56 deletions(-) create mode 100644 pkgs/applications/editors/vim/plugins/sniprun/default.nix rename pkgs/applications/editors/vim/plugins/{patches => }/sniprun/fix-paths.patch (100%) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 1530e2f009c31..f8b5a17cf1859 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2863,62 +2863,7 @@ in ]; }; - sniprun = - let - version = "1.3.16"; - src = fetchFromGitHub { - owner = "michaelb"; - repo = "sniprun"; - rev = "refs/tags/v${version}"; - hash = "sha256-2rVeBUkdLXUiHkd8slyiLTYQBKwgMQvIi/uyCToVBYA="; - }; - sniprun-bin = rustPlatform.buildRustPackage { - pname = "sniprun-bin"; - inherit version src; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - cargoHash = "sha256-eZcWS+DWec0V9G6hBnZRUNcb3uZeSiBhn4Ed9KodFV8="; - - nativeBuildInputs = [ makeWrapper ]; - - postInstall = '' - wrapProgram $out/bin/sniprun \ - --prefix PATH ${ - lib.makeBinPath [ - bashInteractive - coreutils - curl - gnugrep - gnused - procps - ] - } - ''; - - doCheck = false; - }; - in - buildVimPlugin { - pname = "sniprun"; - inherit version src; - - patches = [ ./patches/sniprun/fix-paths.patch ]; - postPatch = '' - substituteInPlace lua/sniprun.lua --replace '@sniprun_bin@' ${sniprun-bin} - ''; - - propagatedBuildInputs = [ sniprun-bin ]; - - meta = { - homepage = "https://github.com/michaelb/sniprun/"; - changelog = "https://github.com/michaelb/sniprun/blob/v${version}/CHANGELOG.md"; - maintainers = with lib.maintainers; [ GaetanLepage ]; - }; - nvimRequireCheck = "sniprun"; - }; + sniprun = callPackage ./sniprun { }; # The GitHub repository returns 404, which breaks the update script Spacegray-vim = buildVimPlugin { diff --git a/pkgs/applications/editors/vim/plugins/sniprun/default.nix b/pkgs/applications/editors/vim/plugins/sniprun/default.nix new file mode 100644 index 0000000000000..8ea4a90ca87f6 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/sniprun/default.nix @@ -0,0 +1,77 @@ +{ + lib, + fetchFromGitHub, + nix-update-script, + rustPlatform, + vimUtils, + makeWrapper, + bashInteractive, + coreutils, + curl, + gnugrep, + gnused, + procps, +}: +let + version = "1.3.16"; + src = fetchFromGitHub { + owner = "michaelb"; + repo = "sniprun"; + tag = "v${version}"; + hash = "sha256-2rVeBUkdLXUiHkd8slyiLTYQBKwgMQvIi/uyCToVBYA="; + }; + sniprun-bin = rustPlatform.buildRustPackage { + pname = "sniprun-bin"; + inherit version src; + + cargoHash = "sha256-eZcWS+DWec0V9G6hBnZRUNcb3uZeSiBhn4Ed9KodFV8="; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/sniprun \ + --prefix PATH ${ + lib.makeBinPath [ + bashInteractive + coreutils + curl + gnugrep + gnused + procps + ] + } + ''; + + doCheck = false; + }; +in +vimUtils.buildVimPlugin { + pname = "sniprun"; + inherit version src; + + patches = [ ./fix-paths.patch ]; + + postPatch = '' + substituteInPlace lua/sniprun.lua --replace '@sniprun_bin@' ${sniprun-bin} + ''; + + propagatedBuildInputs = [ sniprun-bin ]; + + nvimRequireCheck = "sniprun"; + + passthru = { + updateScript = nix-update-script { + attrPath = "vimPlugins.sniprun.sniprun-bin"; + }; + + # needed for the update script + inherit sniprun-bin; + }; + + meta = { + homepage = "https://github.com/michaelb/sniprun/"; + changelog = "https://github.com/michaelb/sniprun/blob/${src.tag}/CHANGELOG.md"; + maintainers = with lib.maintainers; [ GaetanLepage ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch b/pkgs/applications/editors/vim/plugins/sniprun/fix-paths.patch similarity index 100% rename from pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch rename to pkgs/applications/editors/vim/plugins/sniprun/fix-paths.patch From 09a3af9956c1e8f765143bc02e07e4f6df23cb74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 14:57:11 +0000 Subject: [PATCH 126/146] rain-bittorrent: 1.13.0 -> 2.0.0 --- pkgs/by-name/ra/rain-bittorrent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/rain-bittorrent/package.nix b/pkgs/by-name/ra/rain-bittorrent/package.nix index 977f383996421..ec1d17857f976 100644 --- a/pkgs/by-name/ra/rain-bittorrent/package.nix +++ b/pkgs/by-name/ra/rain-bittorrent/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "rain"; - version = "1.13.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "cenkalti"; repo = "rain"; rev = "refs/tags/v${version}"; - hash = "sha256-pz20vhr3idXja7wYIdVr1dosSpqYiQfeho66rqd718I="; + hash = "sha256-bn1LblXwYqZxfCuOmnmWo4Q8Ltt7ARnDCyEI7iNuYHU="; }; - vendorHash = "sha256-40DK0D9TRJDfrMbBJNpcNzvjKb/uXN/Yz5Bb7oXBh+E="; + vendorHash = "sha256-SX686l6fsr3Gm+gyzNUZUSGXwAnxaTvUo/J57N10fmU="; meta = { description = "BitTorrent client and library in Go"; From 50631d89b97c73bc79f3002286707ed98c4460fc Mon Sep 17 00:00:00 2001 From: WeetHet Date: Mon, 18 Nov 2024 11:36:39 +0100 Subject: [PATCH 127/146] livekit-libwebrtc: init at m114 Co-authored-by: Niklas Korz --- .../0001-shared-libraries.patch | 15 + .../li/livekit-libwebrtc/gclient2nix.nix | 61 ++++ .../livekit-libwebrtc/mkSystemLibraries.nix | 64 ++++ pkgs/by-name/li/livekit-libwebrtc/package.nix | 298 ++++++++++++++++++ pkgs/by-name/li/livekit-libwebrtc/sources.nix | 228 ++++++++++++++ 5 files changed, 666 insertions(+) create mode 100644 pkgs/by-name/li/livekit-libwebrtc/0001-shared-libraries.patch create mode 100644 pkgs/by-name/li/livekit-libwebrtc/gclient2nix.nix create mode 100644 pkgs/by-name/li/livekit-libwebrtc/mkSystemLibraries.nix create mode 100644 pkgs/by-name/li/livekit-libwebrtc/package.nix create mode 100644 pkgs/by-name/li/livekit-libwebrtc/sources.nix diff --git a/pkgs/by-name/li/livekit-libwebrtc/0001-shared-libraries.patch b/pkgs/by-name/li/livekit-libwebrtc/0001-shared-libraries.patch new file mode 100644 index 0000000000000..1baf8dd630811 --- /dev/null +++ b/pkgs/by-name/li/livekit-libwebrtc/0001-shared-libraries.patch @@ -0,0 +1,15 @@ +diff --git a/BUILD.gn b/BUILD.gn +index d5289b8..598bbbc 100644 +--- a/BUILD.gn ++++ b/BUILD.gn +@@ -138,8 +138,8 @@ config("library_impl_config") { + # target_defaults and direct_dependent_settings. + config("common_inherited_config") { + defines = [] +- cflags = [] +- ldflags = [] ++ cflags = [ "-fvisibility=default" ] ++ ldflags = [ "-lavutil", "-lavformat", "-lavcodec" ] + + if (rtc_dlog_always_on) { + defines += [ "DLOG_ALWAYS_ON" ] diff --git a/pkgs/by-name/li/livekit-libwebrtc/gclient2nix.nix b/pkgs/by-name/li/livekit-libwebrtc/gclient2nix.nix new file mode 100644 index 0000000000000..5008a586ce76d --- /dev/null +++ b/pkgs/by-name/li/livekit-libwebrtc/gclient2nix.nix @@ -0,0 +1,61 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + click, + nurl, + nix-prefetch-git, + nix, + coreutils, + nixfmt-rfc-style, + makeWrapper, +}: +# Based on https://github.com/milahu/gclient2nix +# but with libwebrtc-specific changes. +let + nativeDeps = [ + nurl + nix-prefetch-git + nix + coreutils + nixfmt-rfc-style + ]; +in +buildPythonPackage { + pname = "gclient2nix"; + version = "0.2.0-unstable-2024-12-19"; + pyproject = true; + + src = fetchFromGitHub { + owner = "WeetHet"; + repo = "gclient2nix"; + rev = "bdf5ab79818595be9dcfc655bd6784cf4bcdb863"; + hash = "sha256-KOXG8E2g30XyZGmM4ZnYPBSybBhHIjOZL8ZXRKYrkZQ="; + }; + + build-system = [ + flit-core + ]; + + dependencies = [ + click + ]; + + nativeBuildInputs = [ makeWrapper ]; + + postFixup = '' + wrapProgram $out/bin/gclient2nix \ + --set PATH ${lib.makeBinPath nativeDeps} + ''; + + meta = { + description = "Generate Nix expressions for projects based on the Google build tools"; + homepage = "https://github.com/WeetHet/gclient2nix"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + WeetHet + ]; + mainProgram = "gclient2nix"; + }; +} diff --git a/pkgs/by-name/li/livekit-libwebrtc/mkSystemLibraries.nix b/pkgs/by-name/li/livekit-libwebrtc/mkSystemLibraries.nix new file mode 100644 index 0000000000000..4293798faf903 --- /dev/null +++ b/pkgs/by-name/li/livekit-libwebrtc/mkSystemLibraries.nix @@ -0,0 +1,64 @@ +{ + brotli, + fontconfig, + freetype, + harfbuzz, + icu, + jsoncpp, + libpng, + libwebp, + libxml2, + libxslt, + minizip, + ffmpeg_6, +}: +{ + "brotli" = { + package = brotli; + path = "third_party/brotli/BUILD.gn"; + }; + "fontconfig" = { + package = fontconfig; + path = "third_party/fontconfig/BUILD.gn"; + }; + "freetype" = { + package = freetype; + path = "build/config/freetype/freetype.gni"; + }; + "harfbuzz-ng" = { + package = harfbuzz; + path = "third_party/harfbuzz-ng/harfbuzz.gni"; + }; + "jsoncpp" = { + package = jsoncpp; + path = "third_party/jsoncpp/BUILD.gn"; + }; + "icu" = { + package = icu; + path = "third_party/icu/BUILD.gn"; + }; + "libpng" = { + package = libpng; + path = "third_party/libpng/BUILD.gn"; + }; + "libwebp" = { + package = libwebp; + path = "third_party/libwebp/BUILD.gn"; + }; + "libxml" = { + package = libxml2; + path = "third_party/libxml/BUILD.gn"; + }; + "libxslt" = { + package = libxslt; + path = "third_party/libxslt/BUILD.gn"; + }; + "zlib" = { + package = minizip; + path = "third_party/zlib/BUILD.gn"; + }; + "ffmpeg" = { + package = ffmpeg_6; + path = "third_party/ffmpeg/BUILD.gn"; + }; +} diff --git a/pkgs/by-name/li/livekit-libwebrtc/package.nix b/pkgs/by-name/li/livekit-libwebrtc/package.nix new file mode 100644 index 0000000000000..20589f68b8799 --- /dev/null +++ b/pkgs/by-name/li/livekit-libwebrtc/package.nix @@ -0,0 +1,298 @@ +{ + stdenv, + clang, + callPackage, + lib, + gn, + fetchurl, + fetchpatch, + xcbuild, + python3, + ninja, + apple-sdk_14, + darwinMinVersionHook, + git, + cpio, + pkg-config, + glib, + alsa-lib, + pulseaudio, + nasm, + brotli, + fontconfig, + freetype, + harfbuzz, + icu, + jsoncpp, + libpng, + libwebp, + libxml2, + libxslt, + minizip, + ffmpeg_6, + writeShellScript, +}: +let + sources = callPackage ./sources.nix { }; + + platformMap = { + "x86_64" = "x64"; + "i686" = "x86"; + "arm" = "arm"; + "aarch64" = "arm64"; + }; + cpuName = stdenv.hostPlatform.parsed.cpu.name; + gnArch = platformMap."${cpuName}" or (throw "unsupported arch ${cpuName}"); + gnOs = + if stdenv.hostPlatform.isLinux then + "linux" + else if stdenv.hostPlatform.isDarwin then + "mac" + else + throw "unknown platform ${stdenv.hostPlatform.config}"; + boringSslSymbols = fetchurl { + url = "https://raw.githubusercontent.com/livekit/rust-sdks/refs/tags/webrtc-dac8015-6/webrtc-sys/libwebrtc/boringssl_prefix_symbols.txt"; + hash = "sha256-dAweArv8zjsFPENEKi9mNBQkt4y+hh3rCqG6QZjRC20="; + }; + gnSystemLibraries = import ./mkSystemLibraries.nix { + inherit + brotli + fontconfig + freetype + harfbuzz + icu + jsoncpp + libpng + libwebp + libxml2 + libxslt + minizip + ffmpeg_6 + ; + }; + gclient2nix = python3.pkgs.callPackage ./gclient2nix.nix { }; +in +stdenv.mkDerivation { + pname = "livekit-libwebrtc"; + version = "m114"; + + src = "${sources}/src"; + + patches = [ + # Adds missing dependencies to generated LICENSE + (fetchpatch { + url = "https://raw.githubusercontent.com/livekit/rust-sdks/b41861c7b71762d5d85b3de07ae67ffcae7c3fa2/webrtc-sys/libwebrtc/patches/add_licenses.patch"; + hash = "sha256-9A4KyRW1K3eoQxsTbPX0vOnj66TCs2Fxjpsu5wO8mGI="; + }) + # Fixes the certificate chain, required for Let's Encrypt certs + (fetchpatch { + url = "https://raw.githubusercontent.com/livekit/rust-sdks/b41861c7b71762d5d85b3de07ae67ffcae7c3fa2/webrtc-sys/libwebrtc/patches/ssl_verify_callback_with_native_handle.patch"; + hash = "sha256-/gneuCac4VGJCWCjJZlgLKFOTV+x7Lc5KVFnNIKenwM="; + }) + # Adds dependencies and features required by livekit + (fetchpatch { + url = "https://raw.githubusercontent.com/livekit/rust-sdks/b41861c7b71762d5d85b3de07ae67ffcae7c3fa2/webrtc-sys/libwebrtc/patches/add_deps.patch"; + hash = "sha256-EMNYcTcBYh51Tt96+HP43ND11qGKClfx3xIPQmIBSo0="; + }) + # Fixes concurrency and localization issues + (fetchpatch { + url = "https://github.com/zed-industries/webrtc/commit/08f7a701a2eda6407670508fc2154257a3c90308.patch"; + hash = "sha256-oWYZLwqjRSHDt92MqsxsoBSMyZKj1ubNbOXZRbPpbEw="; + }) + # Required for dynamically linking to ffmpeg libraries and exposing symbols + ./0001-shared-libraries.patch + ]; + + postPatch = + '' + substituteInPlace tools/generate_shim_headers/generate_shim_headers.py \ + --replace-fail "OFFICIAL_BUILD" "GOOGLE_CHROME_BUILD" + + substituteInPlace BUILD.gn \ + --replace-fail "rtc_static_library" "rtc_shared_library" \ + --replace-fail "complete_static_lib = true" "" + + substituteInPlace webrtc.gni \ + --replace-fail "!build_with_chromium && is_component_build" "false" + + substituteInPlace rtc_tools/BUILD.gn \ + --replace-fail "\":frame_analyzer\"," "" + + for lib in ${toString (builtins.attrNames gnSystemLibraries)}; do + if [ -d "third_party/$lib" ]; then + find "third_party/$lib" -type f \ + \! -path "third_party/$lib/chromium/*" \ + \! -path "third_party/$lib/google/*" \ + \! -path "third_party/harfbuzz-ng/utils/hb_scoped.h" \ + \! -regex '.*\.\(gn\|gni\|isolate\)' \ + \! -name 'LICENSE*' \ + \! -name 'COPYING*' \ + -delete + fi + done + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + ln -sf ${lib.getExe gn} buildtools/linux64/gn + substituteInPlace build/toolchain/linux/BUILD.gn \ + --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + ln -sf ${lib.getExe gn} buildtools/mac/gn + chmod +x build/toolchain/apple/linker_driver.py + patchShebangs build/toolchain/apple/linker_driver.py + substituteInPlace build/toolchain/apple/toolchain.gni --replace-fail "/bin/cp -Rc" "cp -a" + ''; + + nativeBuildInputs = + (builtins.concatLists ( + lib.mapAttrsToList ( + _: library: if (library.package ? dev) then [ library.package.dev ] else [ ] + ) gnSystemLibraries + )) + ++ [ + gn + (python3.withPackages (ps: [ ps.setuptools ])) + ninja + git + cpio + pkg-config + ] + ++ lib.optionals stdenv.isDarwin [ xcbuild ]; + + buildInputs = + [ nasm ] + ++ (lib.mapAttrsToList (_: library: library.package) gnSystemLibraries) + ++ (lib.optionals stdenv.hostPlatform.isLinux [ + glib + alsa-lib + pulseaudio + ]) + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_14 + (darwinMinVersionHook "12.3") + ]; + + preConfigure = '' + echo "generate_location_tags = true" >> build/config/gclient_args.gni + echo "0" > build/util/LASTCHANGE.committime + + python build/linux/unbundle/replace_gn_files.py \ + --system-libraries ${toString (builtins.attrNames gnSystemLibraries)} + ''; + + gnFlags = + [ + "is_debug=false" + "rtc_include_tests=false" + ''target_os="${gnOs}"'' + ''target_cpu="${gnArch}"'' + "treat_warnings_as_errors=false" + "rtc_enable_protobuf=false" + "rtc_include_tests=false" + "rtc_build_examples=false" + "rtc_build_tools=false" + "rtc_libvpx_build_vp9=true" + "enable_libaom=true" + "use_dummy_lastchange=true" + "is_component_build=true" + "enable_stripping=true" + "rtc_use_h264=true" + "use_custom_libcxx=false" + "use_rtti=true" + ] + ++ (lib.optionals stdenv.hostPlatform.isLinux [ + "use_goma=false" + "rtc_use_pipewire=false" + "symbol_level=0" + "enable_iterator_debugging=false" + "rtc_use_x11=false" + "use_sysroot=false" + "is_clang=false" + ]) + ++ (lib.optionals stdenv.hostPlatform.isDarwin [ + ''mac_deployment_target="12.3"'' + "rtc_enable_symbol_export=true" + "rtc_enable_objc_symbol_export=true" + "rtc_include_dav1d_in_internal_decoder_factory=true" + "clang_use_chrome_plugins=false" + "use_lld=false" + ''clang_base_path="${clang}"'' + ]); + + ninjaFlags = + [ ":default" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "api/audio_codecs:builtin_audio_decoder_factory" + "api/task_queue:default_task_queue_factory" + "sdk:native_api" + "sdk:default_codec_factory_objc" + "pc:peerconnection" + "sdk:videocapture_objc" + "sdk:mac_framework_objc" + ]; + + postBuild = + lib.optionalString stdenv.hostPlatform.isLinux '' + objcopy --redefine-syms="${boringSslSymbols}" "libwebrtc.so" + '' + + '' + # Generate licenses + python3 "../../tools_webrtc/libs/generate_licenses.py" \ + --target ${if stdenv.hostPlatform.isDarwin then ":webrtc" else ":default"} $PWD $PWD + ''; + + installPhase = + '' + runHook preInstall + + mkdir -p $out/{lib,include} + cp obj/webrtc.ninja $out/ + cp args.gn $out/ + cp LICENSE.md $out/ + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + cp libwebrtc.so $out/lib/ + cp libthird_party_boringssl.so $out/lib/ + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Library/Frameworks + cp -r WebRTC.framework $out/Library/Frameworks + cp libwebrtc.dylib $out/lib + cp libthird_party_boringssl.dylib $out/lib/ + '' + + '' + cd ../.. + find . -name "*.h" -print | cpio -pd $out/include + + runHook postInstall + ''; + + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + boringssl="$out/lib/libthird_party_boringssl.dylib" + webrtc="$out/lib/libwebrtc.dylib" + framework="$out/Library/Frameworks/WebRTC.framework/Versions/A/WebRTC" + + install_name_tool -id "$boringssl" "$boringssl" + install_name_tool -id "$webrtc" "$webrtc" + install_name_tool -change @rpath/libthird_party_boringssl.dylib "$boringssl" "$webrtc" + install_name_tool -id "$framework" "$framework" + install_name_tool -change @rpath/libthird_party_boringssl.dylib "$boringssl" "$framework" + ''; + + passthru.updateScript = writeShellScript "update-livekit-libwebrtc" '' + set -eou pipefail + cd pkgs/by-name/li/livekit-libwebrtc + ${lib.getExe gclient2nix} --main-source-path src https://github.com/webrtc-sdk/webrtc.git m114_release + ''; + + meta = { + description = "WebRTC library used by livekit"; + homepage = "https://github.com/livekit/rust-sdks/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + WeetHet + niklaskorz + ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} diff --git a/pkgs/by-name/li/livekit-libwebrtc/sources.nix b/pkgs/by-name/li/livekit-libwebrtc/sources.nix new file mode 100644 index 0000000000000..d305428d1e8c1 --- /dev/null +++ b/pkgs/by-name/li/livekit-libwebrtc/sources.nix @@ -0,0 +1,228 @@ +{ + fetchFromGitHub, + fetchFromGitiles, + fetchgit, + fetchurl, + runCommand, + lib, +}: +let + sourceDerivations = { + "src" = fetchFromGitHub { + owner = "webrtc-sdk"; + repo = "webrtc"; + rev = "dac8015ce039c8658706b222746808f01968256b"; + hash = "sha256-T5syfRzX/LfvEllVurzZPKffkciTd2inUEC2py78ZPA="; + }; + "src/base" = fetchFromGitiles { + url = "https://chromium.googlesource.com/chromium/src/base"; + rev = "fe22033c21d399a340b3f4604722463d9da25c6e"; + hash = "sha256-iqtcXEtmCNioKRxfTCwiU/NG0xlQ1R/6GE1M6qC0XTU="; + }; + "src/build" = fetchFromGitiles { + url = "https://chromium.googlesource.com/chromium/src/build"; + rev = "a9d28a095c8b349f8319ee0d241a78e2c849928f"; + hash = "sha256-5NguoLWm6v68fpyHK6SYbM6vHdaOT0quks5/SPW0XOI="; + }; + "src/buildtools" = fetchFromGitiles { + url = "https://chromium.googlesource.com/chromium/src/buildtools"; + rev = "539a6f68735c631f57ae33096e9e7fc059e049cf"; + hash = "sha256-1u4BQqXcW4Z9LPx7lMjBLK8ouKkyb576FRvB2LGwf7Q="; + }; + "src/testing" = fetchFromGitiles { + url = "https://chromium.googlesource.com/chromium/src/testing"; + rev = "ee4801b4e9c2d945fff5236d8518511e6c00a29e"; + hash = "sha256-xUfPwWVPoLxlCWHFKLWtRC1kVJgLgcvSoXPYmrseCXE="; + }; + "src/third_party" = fetchFromGitiles { + url = "https://chromium.googlesource.com/chromium/src/third_party"; + rev = "4f8bf4c6885ab577c7577c4cdd11d04eaf78e9ca"; + hash = "sha256-4ehEerUw9IvghdPPrrh+WCm/XEpVe5PjjIRbQZpIsbY="; + }; + "src/buildtools/clang_format/script" = fetchFromGitiles { + url = "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format"; + rev = "f97059df7f8b205064625cdb5f97b56668a125ef"; + hash = "sha256-IL6ReGM6+urkXfGYe1BBOv+0XgCZv5i3Lib1q9COhig="; + }; + "src/buildtools/third_party/libc++/trunk" = fetchFromGitiles { + url = "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx"; + rev = "bff81b702ff4b7f74b1c0ed02a4bcf6c2744a90b"; + hash = "sha256-i/FGU9F7HlGJJuwoFMV4V05pf4pvsqNxrPBN223YjZQ="; + }; + "src/buildtools/third_party/libc++abi/trunk" = fetchFromGitiles { + url = "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi"; + rev = "307bd163607c315d46103ebe1d68aab44bf93986"; + hash = "sha256-Zka8AHFtHA4AC/Pbzc3pVqz/k2GYZYc8CeP1IXxGBUM="; + }; + "src/buildtools/third_party/libunwind/trunk" = fetchFromGitiles { + url = "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind"; + rev = "2795322d57001de8125cfdf18cef804acff69e35"; + hash = "sha256-u6FMD83JBBusQuWU7Hx5HREvLIFWUA4iN4If8poaHbE="; + }; + "src/third_party/boringssl/src" = fetchFromGitiles { + url = "https://boringssl.googlesource.com/boringssl"; + rev = "6776d5cd8fcdf6c5e05bae2d655076dbeaa56103"; + hash = "sha256-KvQhpkn1pGQ/xPbkHcGgTTvL3GGRL1TfdSPYgfNn5bU="; + }; + "src/third_party/breakpad/breakpad" = fetchFromGitiles { + url = "https://chromium.googlesource.com/breakpad/breakpad"; + rev = "9bf8d1ec526cec139b2d3fba148ce81ccf2cceab"; + hash = "sha256-c3/ksp01+cmSyzaD5SF0Lnnw+t78RwZAKCJnwg1NGXU="; + }; + "src/third_party/catapult" = fetchFromGitiles { + url = "https://chromium.googlesource.com/catapult"; + rev = "cae7ec667dee9f5c012b54ee9ffee94eb7beda14"; + hash = "sha256-vK7rlGshfzPzaEdAxlP5vQ4USR/fC3BzPCh/rn0aAf4="; + }; + "src/third_party/ced/src" = fetchFromGitiles { + url = "https://chromium.googlesource.com/external/github.com/google/compact_enc_det"; + rev = "ba412eaaacd3186085babcd901679a48863c7dd5"; + hash = "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY="; + }; + "src/third_party/colorama/src" = fetchFromGitiles { + url = "https://chromium.googlesource.com/external/colorama"; + rev = "3de9f013df4b470069d03d250224062e8cf15c49"; + hash = "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk="; + }; + "src/third_party/crc32c/src" = fetchFromGitiles { + url = "https://chromium.googlesource.com/external/github.com/google/crc32c"; + rev = "fa5ade41ee480003d9c5af6f43567ba22e4e17e6"; + hash = "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc="; + }; + "src/third_party/depot_tools" = fetchFromGitiles { + url = "https://chromium.googlesource.com/chromium/tools/depot_tools"; + rev = "6e714e6dfe62110c95fafed4bdeb365a69c6a77e"; + hash = "sha256-7jPow77ejToE55KvQ7/eO0alMdMHcypfSyPceFAbZkw="; + }; + "src/third_party/ffmpeg" = fetchFromGitiles { + url = "https://chromium.googlesource.com/chromium/third_party/ffmpeg"; + rev = "8d21d41d8bec5c0b266ee305d1a708dc5c23b594"; + hash = "sha256-UjrZJBtOQiiqxtLb8x24axord3OFvyCcRcgDwiYE/jw="; + }; + "src/third_party/flatbuffers/src" = fetchFromGitiles { + url = "https://chromium.googlesource.com/external/github.com/google/flatbuffers"; + rev = "a56f9ec50e908362e20254fcef28e62a2f148d91"; + hash = "sha256-OQ8E+i30WRz/lPJmVDiF7+TPo4gZVu2Of9loxz3tswI="; + }; + "src/third_party/grpc/src" = fetchFromGitiles { + url = "https://chromium.googlesource.com/external/github.com/grpc/grpc"; + rev = "822dab21d9995c5cf942476b35ca12a1aa9d2737"; + hash = "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8="; + }; + "src/third_party/fontconfig/src" = fetchFromGitiles { + url = "https://chromium.googlesource.com/external/fontconfig"; + rev = "06929a556fdc39c8fe12965b69070c8df520a33e"; + hash = "sha256-0R+FEhtGXFiQWHEPRrJqaBW1JVfCojYI4NPDvYMBhoU="; + }; + "src/third_party/freetype/src" = fetchFromGitiles { + url = "https://chromium.googlesource.com/chromium/src/third_party/freetype2"; + rev = "9806414c15230d253d5219ea0dafeddb717307b1"; + hash = "sha256-UbWtRb24U7Cv+PecVtoNG33Q1ItmkvssmW8Bh8qlFvA="; + }; + "src/third_party/harfbuzz-ng/src" = fetchFromGitiles { + url = "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz"; + rev = "2822b589bc837fae6f66233e2cf2eef0f6ce8470"; + hash = "sha256-qwtRORl/Pu4M9EvW8MdK8onFMCw/4+57FEBjoNt4qoY="; + }; + "src/third_party/google_benchmark/src" = fetchFromGitiles { + url = "https://chromium.googlesource.com/external/github.com/google/benchmark"; + rev = "b177433f3ee2513b1075140c723d73ab8901790f"; + hash = "sha256-h2ryAQAuHI54Cni88L85e7Np4KATGVTRdDcmUvCNeWc="; + }; + "src/third_party/gtest-parallel" = fetchFromGitiles { + url = "https://chromium.googlesource.com/external/github.com/google/gtest-parallel"; + rev = "f4d65b555894b301699c7c3c52906f72ea052e83"; + hash = "sha256-dzWXJHPb8RHqxoi/gA9npwnjAsT8gg7A90g/dx8LVwQ="; + }; + "src/third_party/googletest/src" = fetchFromGitiles { + url = "https://chromium.googlesource.com/external/github.com/google/googletest"; + rev = "af29db7ec28d6df1c7f0f745186884091e602e07"; + hash = "sha256-VYRjcM3dDY2FarviXyFMgSkXCqKfWXwtGAj2Msgm7zg="; + }; + "src/third_party/icu" = fetchFromGitiles { + url = "https://chromium.googlesource.com/chromium/deps/icu"; + rev = "d8daa943f64cd5dd2a55e9baf2e655ab4bfa5ae9"; + hash = "sha256-47Xxb5IFbRmdO3oADjn13fm7aIYFXh2R4YVZIJAy22U="; + }; + "src/third_party/jsoncpp/source" = fetchFromGitiles { + url = "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp"; + rev = "42e892d96e47b1f6e29844cc705e148ec4856448"; + hash = "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q="; + }; + "src/third_party/libFuzzer/src" = fetchFromGitiles { + url = "https://chromium.googlesource.com/chromium/llvm-project/compiler-rt/lib/fuzzer"; + rev = "debe7d2d1982e540fbd6bd78604bf001753f9e74"; + hash = "sha256-HG3KHhKQnr4hdnUK/2QhcxRdNxh38fhU54JKKzqZaio="; + }; + "src/third_party/libjpeg_turbo" = fetchFromGitiles { + url = "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo"; + rev = "aa4075f116e4312537d0d3e9dbd5e31096539f94"; + hash = "sha256-QnXMR9qqRiYfV1sUJvKVvLQ9A022lYKbsrI9HOU9LCs="; + }; + "src/third_party/libsrtp" = fetchFromGitiles { + url = "https://chromium.googlesource.com/chromium/deps/libsrtp"; + rev = "5b7c744eb8310250ccc534f3f86a2015b3887a0a"; + hash = "sha256-pfLFh2JGk/g0ZZxBKTaYW9/PBpkCm0rtJeyNePUMTTc="; + }; + "src/third_party/dav1d/libdav1d" = fetchFromGitiles { + url = "https://chromium.googlesource.com/external/github.com/videolan/dav1d"; + rev = "d426d1c91075b9c552b12dd052af1cd0368f05a2"; + hash = "sha256-FivzwqCvlY89q2znGvfNks+hje/iUFHcKPb19FyAZhM="; + }; + "src/third_party/libaom/source/libaom" = fetchFromGitiles { + url = "https://aomedia.googlesource.com/aom"; + rev = "5a0903824082f41123e8365b5b99ddb6ced8971c"; + hash = "sha256-j8b0xM7hHNqYIeUQjf+c7LyzcfZVJx64Xqo9gIRtsYU="; + }; + "src/third_party/perfetto" = fetchFromGitiles { + url = "https://android.googlesource.com/platform/external/perfetto"; + rev = "20b114cd063623e63ef1b0a31167d60081567e51"; + hash = "sha256-6BpUd+BplRR/0eUIYz5SehzrpNHPfUm2Qv6U1+Mxy8g="; + }; + "src/third_party/libvpx/source/libvpx" = fetchFromGitiles { + url = "https://chromium.googlesource.com/webm/libvpx"; + rev = "7aaffe2df4c9426ab204a272ca5ca52286ca86d4"; + hash = "sha256-Uis24FzUtM38ktPG/wDJLiHZYmpmYFGbuQ/SWnmZJSA="; + }; + "src/third_party/libyuv" = fetchFromGitiles { + url = "https://chromium.googlesource.com/libyuv/libyuv"; + rev = "77c2121f7e6b8e694d6e908bbbe9be24214097da"; + hash = "sha256-LLmTW05GxoXgNkLRHp3e6gb7glMgJo1moc6lPLVHk6w="; + }; + "src/third_party/lss" = fetchFromGitiles { + url = "https://chromium.googlesource.com/linux-syscall-support"; + rev = "ce877209e11aa69dcfffbd53ef90ea1d07136521"; + hash = "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw="; + }; + "src/third_party/nasm" = fetchFromGitiles { + url = "https://chromium.googlesource.com/chromium/deps/nasm"; + rev = "7fc833e889d1afda72c06220e5bed8fb43b2e5ce"; + hash = "sha256-L+b3X3vsfpY6FSlIK/AHhxhmq2cXd50vND6uT6yn8Qs="; + }; + "src/third_party/openh264/src" = fetchFromGitiles { + url = "https://chromium.googlesource.com/external/github.com/cisco/openh264"; + rev = "09a4f3ec842a8932341b195c5b01e141c8a16eb7"; + hash = "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c="; + }; + "src/tools" = fetchFromGitiles { + url = "https://chromium.googlesource.com/chromium/src/tools"; + rev = "bafae7909cbbcd277d29c0da0809001a8d6f4a14"; + hash = "sha256-MK5M9RrX+cX4S7vsMgNVQ2YkNbEuvizKueuc1mA5jyU="; + }; + }; + namedSourceDerivations = builtins.mapAttrs ( + path: drv: + drv.overrideAttrs { + name = lib.strings.sanitizeDerivationName path; + } + ) sourceDerivations; +in +runCommand "combined-sources" { } ( + lib.concatLines ( + [ "mkdir $out" ] + ++ (lib.mapAttrsToList (path: drv: '' + mkdir -p $out/${path} + cp --no-preserve=mode --reflink=auto -rfT ${drv} $out/${path} + '') namedSourceDerivations) + ) +) From 38a486b842eeab0601c814f4036b69327e18c6c6 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Thu, 19 Dec 2024 00:20:40 +0100 Subject: [PATCH 128/146] zed-editor: fix update script --- pkgs/by-name/ze/zed-editor/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 2a87dae3f59a3..b774a044e2555 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -286,7 +286,7 @@ rustPlatform.buildRustPackage rec { passthru = { updateScript = gitUpdater { rev-prefix = "v"; - ignoredVersions = "pre"; + ignoredVersions = "(*-pre|0.999999.0|0.9999-temporary)"; }; fhs = fhs { }; fhsWithPackages = f: fhs { additionalPkgs = f; }; From e1a0224e346b80b9efeba437bbf73963600afb4a Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Mon, 18 Nov 2024 11:38:28 +0100 Subject: [PATCH 129/146] zed-editor: 0.165.4 -> 0.166.1 --- .../0002-disable-livekit-darwin.patch | 55 ---------------- pkgs/by-name/ze/zed-editor/package.nix | 66 +++++++++++-------- 2 files changed, 40 insertions(+), 81 deletions(-) delete mode 100644 pkgs/by-name/ze/zed-editor/0002-disable-livekit-darwin.patch 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 deleted file mode 100644 index 2c82a2d49b688..0000000000000 --- a/pkgs/by-name/ze/zed-editor/0002-disable-livekit-darwin.patch +++ /dev/null @@ -1,55 +0,0 @@ -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/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index b774a044e2555..7f04320f1f273 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -35,6 +35,10 @@ darwinMinVersionHook, makeWrapper, nodejs_22, + libGL, + libX11, + libXext, + livekit-libwebrtc, withGLES ? false, }: @@ -89,35 +93,42 @@ let in rustPlatform.buildRustPackage rec { pname = "zed-editor"; - version = "0.165.4"; + version = "0.166.1"; src = fetchFromGitHub { owner = "zed-industries"; repo = "zed"; - rev = "refs/tags/v${version}"; - hash = "sha256-g+ZHchlxeNDkxUM306OK3BsjrvO3snF4vcQQZJSIhLc="; + tag = "v${version}"; + hash = "sha256-ss4dz9qPAP6eIYbG3S5QJaSR5zEyEqLBjfacj/eb7AE="; }; - 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 - ]; + 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 + # See https://github.com/zed-industries/zed/pull/21661#issuecomment-2524161840 + "script/patches/use-cross-platform-livekit.patch" + ]; + + postPatch = + lib.optionalString stdenv.hostPlatform.isLinux '' + # Dynamically link WebRTC instead of static + substituteInPlace ../${pname}-${version}-vendor/webrtc-sys-*/build.rs \ + --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc" + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # On Darwin, linking against the dylib results in Rust linker errors, while + # linking against the framework works fine. + substituteInPlace ../${pname}-${version}-vendor/webrtc-sys-*/build.rs \ + --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=framework=webrtc" \ + --replace-fail 'println!("cargo:rustc-link-search=native={}", webrtc_lib.to_str().unwrap());' \ + 'println!("cargo:rustc-link-search=framework={}/Library/Frameworks", webrtc_dir.to_str().unwrap());' + ''; useFetchCargoVendor = true; - cargoHash = "sha256-ZNXvuHX9b3T58FUs9TjpfiGYNr9J3IDbz2JE6Vy7Sg0="; + cargoHash = "sha256-HbOdY+6FKGTK5gW2BkWSdciBvTx+oKhCchFvwKEoGNE="; nativeBuildInputs = [ @@ -151,14 +162,16 @@ rustPlatform.buildRustPackage rec { libxkbcommon wayland xorg.libxcb + # required by livekit: + libGL + libX11 + libXext ] ++ 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: + # ScreenCaptureKit, required by livekit, is only available on 12.3 and up: # https://developer.apple.com/documentation/screencapturekit - (darwinMinVersionHook "10.15") + (darwinMinVersionHook "12.3") ]; cargoBuildFlags = [ @@ -183,6 +196,7 @@ rustPlatform.buildRustPackage rec { ZED_UPDATE_EXPLANATION = "Zed has been installed using Nix. Auto-updates have thus been disabled."; # Used by `zed --version` RELEASE_VERSION = version; + LK_CUSTOM_WEBRTC = livekit-libwebrtc; }; RUSTFLAGS = if withGLES then "--cfg gles" else ""; @@ -295,7 +309,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "High-performance, multiplayer code editor from the creators of Atom and Tree-sitter"; homepage = "https://zed.dev"; - changelog = "https://github.com/zed-industries/zed/releases/tag/v${version}"; + changelog = "https://github.com/zed-industries/zed/releases/tag/${src.tag}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ GaetanLepage From fbba3cb434a5079d0cbd596e7910ec7bb4648739 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 19 Dec 2024 22:05:18 -0600 Subject: [PATCH 130/146] vimPlugins.LanguageClient-neovim: move out of vim generated --- .../plugins/LanguageClient-neovim/default.nix | 51 +++++++++++++++++++ .../editors/vim/plugins/generated.nix | 12 ----- .../editors/vim/plugins/overrides.nix | 37 +------------- .../editors/vim/plugins/vim-plugin-names | 1 - 4 files changed, 52 insertions(+), 49 deletions(-) create mode 100644 pkgs/applications/editors/vim/plugins/LanguageClient-neovim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/LanguageClient-neovim/default.nix b/pkgs/applications/editors/vim/plugins/LanguageClient-neovim/default.nix new file mode 100644 index 0000000000000..2ede65b4e72d1 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/LanguageClient-neovim/default.nix @@ -0,0 +1,51 @@ +{ + lib, + fetchFromGitHub, + nix-update-script, + rustPlatform, + vimUtils, +}: +let + version = "0.1.161"; + src = fetchFromGitHub { + owner = "autozimu"; + repo = "LanguageClient-neovim"; + tag = version; + hash = "sha256-Z9S2ie9RxJCIbmjSV/Tto4lK04cZfWmK3IAy8YaySVI="; + }; + LanguageClient-neovim-bin = rustPlatform.buildRustPackage { + pname = "LanguageClient-neovim-bin"; + inherit version src; + + cargoHash = "sha256-H34UqJ6JOwuSABdOup5yKeIwFrGc83TUnw1ggJEx9o4="; + }; +in +vimUtils.buildVimPlugin { + pname = "LanguageClient-neovim"; + inherit version src; + + propagatedBuildInputs = [ LanguageClient-neovim-bin ]; + + preFixup = '' + substituteInPlace "$out"/autoload/LanguageClient.vim \ + --replace-fail \ + "let l:path = s:root . '/bin/'" \ + "let l:path = '${LanguageClient-neovim-bin}' . '/bin/'" + ''; + + passthru = { + updateScript = nix-update-script { + extraArgs = [ "--version-regex=(\\d+\\.\\d+\\.\\d+)" ]; + attrPath = "vimPlugins.LanguageClient-neovim.LanguageClient-neovim-bin"; + }; + + # needed for the update script + inherit LanguageClient-neovim-bin; + }; + + meta = { + homepage = "https://github.com/autozimu/LanguageClient-neovim/"; + changelog = "https://github.com/autozimu/LanguageClient-neovim/releases/tag/${src.tag}"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 4201ae9c839fd..84f9b5af71d82 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -159,18 +159,6 @@ final: prev: meta.homepage = "https://github.com/martinda/Jenkinsfile-vim-syntax/"; }; - LanguageClient-neovim = buildVimPlugin { - pname = "LanguageClient-neovim"; - version = "2022-06-07"; - src = fetchFromGitHub { - owner = "autozimu"; - repo = "LanguageClient-neovim"; - rev = "cf6dd11baf62fb6ce18308e96c0ab43428b7c686"; - sha256 = "0jmbxc0li4w59dzpzadq2phnfhnibggwxb3rvlmhr88dbglm0s8n"; - }; - meta.homepage = "https://github.com/autozimu/LanguageClient-neovim/"; - }; - LanguageTool-nvim = buildVimPlugin { pname = "LanguageTool.nvim"; version = "2020-10-19"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 1530e2f009c31..789e22556d5b8 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1398,42 +1398,7 @@ in nvimRequireCheck = "kulala"; }; - LanguageClient-neovim = - let - version = "0.1.161"; - LanguageClient-neovim-src = fetchFromGitHub { - owner = "autozimu"; - repo = "LanguageClient-neovim"; - rev = version; - sha256 = "Z9S2ie9RxJCIbmjSV/Tto4lK04cZfWmK3IAy8YaySVI="; - }; - LanguageClient-neovim-bin = rustPlatform.buildRustPackage { - pname = "LanguageClient-neovim-bin"; - inherit version; - src = LanguageClient-neovim-src; - - cargoHash = "sha256-H34UqJ6JOwuSABdOup5yKeIwFrGc83TUnw1ggJEx9o4="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; - - # FIXME: Use impure version of CoreFoundation because of missing symbols. - # Undefined symbols for architecture x86_64: "_CFURLResourceIsReachable" - preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' - export NIX_LDFLAGS="-F${CoreFoundation}/Library/Frameworks -framework CoreFoundation $NIX_LDFLAGS" - ''; - }; - in - buildVimPlugin { - pname = "LanguageClient-neovim"; - inherit version; - src = LanguageClient-neovim-src; - - propagatedBuildInputs = [ LanguageClient-neovim-bin ]; - - preFixup = '' - substituteInPlace "$out"/autoload/LanguageClient.vim \ - --replace "let l:path = s:root . '/bin/'" "let l:path = '${LanguageClient-neovim-bin}' . '/bin/'" - ''; - }; + LanguageClient-neovim = callPackage ./LanguageClient-neovim { }; LazyVim = super.LazyVim.overrideAttrs { # Any other dependency is optional diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index e87c429fb6d68..df61a5b9f1a20 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -12,7 +12,6 @@ https://github.com/antoinemadec/FixCursorHold.nvim/,, https://github.com/vim-scripts/Improved-AnsiEsc/,, https://github.com/ionide/Ionide-vim/,HEAD, https://github.com/martinda/Jenkinsfile-vim-syntax/,, -https://github.com/autozimu/LanguageClient-neovim/,, https://github.com/vigoux/LanguageTool.nvim/,, https://github.com/LazyVim/LazyVim/,, https://github.com/Yggdroot/LeaderF/,, From bf85431c4826ed9eb84ee56f8dd9e585aade9940 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 19 Dec 2024 21:53:41 -0600 Subject: [PATCH 131/146] vimPlugins.cord-nvim: move to separate folder Already wasn't in generated or plugin list, had to be manually updated. Moving to callPackage in overrides with update script support. --- .../editors/vim/plugins/cord-nvim/default.nix | 74 +++++++++++++++++++ .../editors/vim/plugins/overrides.nix | 49 +----------- 2 files changed, 75 insertions(+), 48 deletions(-) create mode 100644 pkgs/applications/editors/vim/plugins/cord-nvim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/cord-nvim/default.nix b/pkgs/applications/editors/vim/plugins/cord-nvim/default.nix new file mode 100644 index 0000000000000..1346697f0c099 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/cord-nvim/default.nix @@ -0,0 +1,74 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + rustPlatform, + vimUtils, +}: +let + version = "0-unstable-2024-09-26"; + src = fetchFromGitHub { + owner = "vyfor"; + repo = "cord.nvim"; + rev = "a26b00d58c42174aadf975917b49cec67650545f"; + hash = "sha256-jUxBvWnj0+axuw2SZ2zLzlhZS0tu+Bk8+wHtXENofkw="; + }; + extension = if stdenv.hostPlatform.isDarwin then "dylib" else "so"; + cord-nvim-rust = rustPlatform.buildRustPackage { + pname = "cord.nvim-rust"; + inherit version src; + + cargoHash = "sha256-M5mTdBACTaUVZhPpMOf1KQ3BcQpEoD2isAKRn+iAWjc="; + + installPhase = + let + cargoTarget = stdenv.hostPlatform.rust.cargoShortTarget; + in + '' + install -D target/${cargoTarget}/release/libcord.${extension} $out/lib/cord.${extension} + ''; + }; +in +vimUtils.buildVimPlugin { + pname = "cord.nvim"; + inherit version src; + + nativeBuildInputs = [ + cord-nvim-rust + ]; + + buildPhase = '' + runHook preBuild + + install -D ${cord-nvim-rust}/lib/cord.${extension} cord.${extension} + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -D cord $out/lua/cord.${extension} + + runHook postInstall + ''; + + doInstallCheck = true; + nvimRequireCheck = "cord"; + + passthru = { + updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + attrPath = "vimPlugins.cord-nvim.cord-nvim-rust"; + }; + + # needed for the update script + inherit cord-nvim-rust; + }; + + meta = { + homepage = "https://github.com/vyfor/cord.nvim"; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 1530e2f009c31..38bf716cfd090 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -843,54 +843,7 @@ in nvimRequireCheck = "coq"; }; - cord-nvim = - let - version = "0-unstable-2024-09-26"; - src = fetchFromGitHub { - owner = "vyfor"; - repo = "cord.nvim"; - rev = "a26b00d58c42174aadf975917b49cec67650545f"; - hash = "sha256-jUxBvWnj0+axuw2SZ2zLzlhZS0tu+Bk8+wHtXENofkw="; - }; - extension = if stdenv.hostPlatform.isDarwin then "dylib" else "so"; - rustPackage = rustPlatform.buildRustPackage { - pname = "cord.nvim-rust"; - inherit version src; - - cargoHash = "sha256-M5mTdBACTaUVZhPpMOf1KQ3BcQpEoD2isAKRn+iAWjc="; - - installPhase = - let - cargoTarget = stdenv.hostPlatform.rust.cargoShortTarget; - in - '' - install -D target/${cargoTarget}/release/libcord.${extension} $out/lib/cord.${extension} - ''; - }; - in - buildVimPlugin { - pname = "cord.nvim"; - inherit version src; - - nativeBuildInputs = [ - rustPackage - ]; - - buildPhase = '' - install -D ${rustPackage}/lib/cord.${extension} cord.${extension} - ''; - - installPhase = '' - install -D cord $out/lua/cord.${extension} - ''; - - doInstallCheck = true; - nvimRequireCheck = "cord"; - - meta = { - homepage = "https://github.com/vyfor/cord.nvim"; - }; - }; + cord-nvim = callPackage ./cord-nvim { }; cornelis = super.cornelis.overrideAttrs { dependencies = [ self.vim-textobj-user ]; From 3f573a1b5d82f6947ed0f6572de9eee3a9688df6 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 19 Dec 2024 21:59:31 -0600 Subject: [PATCH 132/146] vimPlugins.cord-nvim: 0-unstable-2024-09-26 -> 0-unstable-2024-12-17 --- .../editors/vim/plugins/cord-nvim/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/cord-nvim/default.nix b/pkgs/applications/editors/vim/plugins/cord-nvim/default.nix index 1346697f0c099..43c0eeb5d9a8b 100644 --- a/pkgs/applications/editors/vim/plugins/cord-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/cord-nvim/default.nix @@ -7,19 +7,19 @@ vimUtils, }: let - version = "0-unstable-2024-09-26"; + version = "0-unstable-2024-12-17"; src = fetchFromGitHub { owner = "vyfor"; repo = "cord.nvim"; - rev = "a26b00d58c42174aadf975917b49cec67650545f"; - hash = "sha256-jUxBvWnj0+axuw2SZ2zLzlhZS0tu+Bk8+wHtXENofkw="; + rev = "c82ab475e7bb198d6fac20833a3468de1a1d14d0"; + hash = "sha256-GVy8q9Fxb3mzx6mUQyIMumjnwZ7W08dPz1O3ckzVvdE="; }; extension = if stdenv.hostPlatform.isDarwin then "dylib" else "so"; cord-nvim-rust = rustPlatform.buildRustPackage { pname = "cord.nvim-rust"; inherit version src; - cargoHash = "sha256-M5mTdBACTaUVZhPpMOf1KQ3BcQpEoD2isAKRn+iAWjc="; + cargoHash = "sha256-unE600Uo8fXaFV0UWRhBenhQaXftDH7K+HyQ/9xo7JY="; installPhase = let From 5333bfa1c3e332076ec1e6eebd566f7248634e48 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 19 Dec 2024 21:47:15 -0600 Subject: [PATCH 133/146] vimPlugins.codesnap-nvim: move out of vim generated --- .../vim/plugins/codesnap-nvim/default.nix | 71 +++++++++++++++++++ .../editors/vim/plugins/generated.nix | 12 ---- .../editors/vim/plugins/overrides.nix | 60 +--------------- .../editors/vim/plugins/vim-plugin-names | 1 - 4 files changed, 72 insertions(+), 72 deletions(-) create mode 100644 pkgs/applications/editors/vim/plugins/codesnap-nvim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/codesnap-nvim/default.nix b/pkgs/applications/editors/vim/plugins/codesnap-nvim/default.nix new file mode 100644 index 0000000000000..66d106a83f77f --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/codesnap-nvim/default.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + pkg-config, + rustPlatform, + vimUtils, + libuv, +}: +let + version = "1.6.1"; + src = fetchFromGitHub { + owner = "mistricky"; + repo = "codesnap.nvim"; + tag = "v${version}"; + hash = "sha256-OmSgrTYDtNb2plMyzjVvxGrfXB/lGKDpUQhpRqKfAMA="; + }; + codesnap-lib = rustPlatform.buildRustPackage { + pname = "codesnap-lib"; + inherit version src; + + sourceRoot = "${src.name}/generator"; + + cargoHash = "sha256-6n37n8oHIHrz3S1+40nuD0Ud3l0iNgXig1ZwrgsnYTI="; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = [ + libuv.dev + ]; + }; +in +vimUtils.buildVimPlugin { + pname = "codesnap.nvim"; + inherit version src; + + # - Remove the shipped pre-built binaries + # - Copy the resulting binary from the codesnap-lib derivation + # Note: the destination should be generator.so, even on darwin + # https://github.com/mistricky/codesnap.nvim/blob/main/scripts/build_generator.sh + postInstall = + let + extension = if stdenv.hostPlatform.isDarwin then "dylib" else "so"; + in + '' + rm -r $out/lua/*.so + cp ${codesnap-lib}/lib/libgenerator.${extension} $out/lua/generator.so + ''; + + doInstallCheck = true; + nvimRequireCheck = "codesnap"; + + passthru = { + updateScript = nix-update-script { + attrPath = "vimPlugins.codesnap-nvim.codesnap-lib"; + }; + + # needed for the update script + inherit codesnap-lib; + }; + + meta = { + homepage = "https://github.com/mistricky/codesnap.nvim/"; + changelog = "https://github.com/mistricky/codesnap.nvim/releases/tag/${src.tag}"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 4201ae9c839fd..16e200001ba4d 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2465,18 +2465,6 @@ final: prev: meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; - codesnap-nvim = buildVimPlugin { - pname = "codesnap.nvim"; - version = "2024-09-22"; - src = fetchFromGitHub { - owner = "mistricky"; - repo = "codesnap.nvim"; - rev = "6400480aa6cc366cbd931146c429aaa64680dab9"; - sha256 = "1kdqh5vn837pxygz141n01zw08apcxi39xzdn5a0zhddimqn16z1"; - }; - meta.homepage = "https://github.com/mistricky/codesnap.nvim/"; - }; - codewindow-nvim = buildVimPlugin { pname = "codewindow.nvim"; version = "2024-06-05"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 1530e2f009c31..105a5ffd7c861 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -72,9 +72,6 @@ zsh, # codeium-nvim dependencies codeium, - # codesnap-nvim dependencies - clang, - libuv, # command-t dependencies getconf, ruby, @@ -678,62 +675,7 @@ in nvimRequireCheck = "codeium"; }; - codesnap-nvim = - let - version = "1.6.1"; - src = fetchFromGitHub { - owner = "mistricky"; - repo = "codesnap.nvim"; - rev = "refs/tags/v${version}"; - hash = "sha256-OmSgrTYDtNb2plMyzjVvxGrfXB/lGKDpUQhpRqKfAMA="; - }; - codesnap-lib = rustPlatform.buildRustPackage { - pname = "codesnap-lib"; - inherit version src; - - sourceRoot = "${src.name}/generator"; - - cargoHash = "sha256-6n37n8oHIHrz3S1+40nuD0Ud3l0iNgXig1ZwrgsnYTI="; - - nativeBuildInputs = [ - pkg-config - rustPlatform.bindgenHook - ]; - - buildInputs = - [ - libuv.dev - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ]; - }; - in - buildVimPlugin { - pname = "codesnap.nvim"; - inherit version src; - - # - Remove the shipped pre-built binaries - # - Copy the resulting binary from the codesnap-lib derivation - # Note: the destination should be generator.so, even on darwin - # https://github.com/mistricky/codesnap.nvim/blob/main/scripts/build_generator.sh - postInstall = - let - extension = if stdenv.hostPlatform.isDarwin then "dylib" else "so"; - in - '' - rm -r $out/lua/*.so - cp ${codesnap-lib}/lib/libgenerator.${extension} $out/lua/generator.so - ''; - - doInstallCheck = true; - nvimRequireCheck = "codesnap"; - - meta = { - homepage = "https://github.com/mistricky/codesnap.nvim/"; - changelog = "https://github.com/mistricky/codesnap.nvim/releases/tag/v${version}"; - }; - }; + codesnap-nvim = callPackage ./codesnap-nvim { }; codewindow-nvim = super.codewindow-nvim.overrideAttrs { dependencies = [ self.nvim-treesitter ]; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index e87c429fb6d68..2025d918087e7 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -203,7 +203,6 @@ https://github.com/manicmaniac/coconut.vim/,HEAD, https://github.com/olimorris/codecompanion.nvim/,HEAD, https://github.com/Exafunction/codeium.nvim/,HEAD, https://github.com/Exafunction/codeium.vim/,HEAD, -https://github.com/mistricky/codesnap.nvim/,HEAD, https://github.com/gorbit99/codewindow.nvim/,HEAD, https://github.com/metakirby5/codi.vim/,, https://github.com/tjdevries/colorbuddy.nvim/,, From 1a6af999371b9c49a67800a3e33be11c151ccf98 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 19 Dec 2024 23:18:40 -0600 Subject: [PATCH 134/146] vimPlugins.vim-markdown-composer: move out of vim generated --- .../editors/vim/plugins/generated.nix | 13 ----- .../editors/vim/plugins/overrides.nix | 18 +------ .../plugins/vim-markdown-composer/default.nix | 49 +++++++++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 - 4 files changed, 50 insertions(+), 31 deletions(-) create mode 100644 pkgs/applications/editors/vim/plugins/vim-markdown-composer/default.nix diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 4201ae9c839fd..0e9ce1ae63ecc 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -16041,19 +16041,6 @@ final: prev: meta.homepage = "https://github.com/preservim/vim-markdown/"; }; - vim-markdown-composer = buildVimPlugin { - pname = "vim-markdown-composer"; - version = "2022-06-14"; - src = fetchFromGitHub { - owner = "euclio"; - repo = "vim-markdown-composer"; - rev = "e6f99bc20cfcb277c63041b1f766e6d5940bcc76"; - sha256 = "0ljv8cvca8nk91g67mnzip81say04b1wbj9bzcgzy8m6qkz1r2h3"; - fetchSubmodules = true; - }; - meta.homepage = "https://github.com/euclio/vim-markdown-composer/"; - }; - vim-markdown-toc = buildVimPlugin { pname = "vim-markdown-toc"; version = "2024-09-01"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 1530e2f009c31..4975c76fca7ef 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3594,23 +3594,7 @@ in ''; }; - vim-markdown-composer = - let - vim-markdown-composer-bin = rustPlatform.buildRustPackage { - pname = "vim-markdown-composer-bin"; - inherit (super.vim-markdown-composer) src version; - cargoHash = "sha256-Vie8vLTplhaVU4E9IohvxERfz3eBpd62m8/1Ukzk8e4="; - # tests require network access - doCheck = false; - }; - in - super.vim-markdown-composer.overrideAttrs { - preFixup = '' - substituteInPlace "$out"/after/ftplugin/markdown/composer.vim \ - --replace "s:plugin_root . '/target/release/markdown-composer'" \ - "'${vim-markdown-composer-bin}/bin/markdown-composer'" - ''; - }; + vim-markdown-composer = callPackage ./vim-markdown-composer { }; vim-matchup = super.vim-matchup.overrideAttrs { # Optional treesitter integration diff --git a/pkgs/applications/editors/vim/plugins/vim-markdown-composer/default.nix b/pkgs/applications/editors/vim/plugins/vim-markdown-composer/default.nix new file mode 100644 index 0000000000000..ff81fdaba36ff --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/vim-markdown-composer/default.nix @@ -0,0 +1,49 @@ +{ + fetchFromGitHub, + nix-update-script, + rustPlatform, + vimUtils, +}: +let + version = "0-unstable-2022-06-14"; + src = fetchFromGitHub { + owner = "euclio"; + repo = "vim-markdown-composer"; + rev = "e6f99bc20cfcb277c63041b1f766e6d5940bcc76"; + sha256 = "0ljv8cvca8nk91g67mnzip81say04b1wbj9bzcgzy8m6qkz1r2h3"; + fetchSubmodules = true; + }; + + vim-markdown-composer-bin = rustPlatform.buildRustPackage { + pname = "vim-markdown-composer-bin"; + inherit src version; + cargoHash = "sha256-z5hjY2RUbM5NLfRtyfiHi4PjMnKdAflaZsHw53lgU2E="; + # tests require network access + doCheck = false; + }; +in +vimUtils.buildVimPlugin { + pname = "vim-markdown-composer"; + inherit version src; + + preFixup = '' + substituteInPlace "$out"/after/ftplugin/markdown/composer.vim \ + --replace-fail \ + "s:plugin_root . '/target/release/markdown-composer'" \ + "'${vim-markdown-composer-bin}/bin/markdown-composer'" + ''; + + passthru = { + updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + attrPath = "vimPlugins.vim-markdown-composer.vim-markdown-composer-bin"; + }; + + # needed for the update script + inherit vim-markdown-composer-bin; + }; + + meta = { + homepage = "https://github.com/euclio/vim-markdown-composer/"; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index e87c429fb6d68..162eb739ad768 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1332,7 +1332,6 @@ https://github.com/google/vim-maktaba/,, https://github.com/lambdalisue/vim-manpager/,, https://github.com/Yilin-Yang/vim-markbar/,, https://github.com/preservim/vim-markdown/,, -https://github.com/euclio/vim-markdown-composer/,, https://github.com/mzlogin/vim-markdown-toc/,, https://github.com/leafOfTree/vim-matchtag/,HEAD, https://github.com/andymass/vim-matchup/,, From 5f5782b4156909a2cad876831bc30c443e3a6ae2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 15:17:00 +0000 Subject: [PATCH 135/146] uptime-kuma: 1.23.15 -> 1.23.16 --- pkgs/by-name/up/uptime-kuma/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/up/uptime-kuma/package.nix b/pkgs/by-name/up/uptime-kuma/package.nix index 8682db20ad453..1c0b8a6737df1 100644 --- a/pkgs/by-name/up/uptime-kuma/package.nix +++ b/pkgs/by-name/up/uptime-kuma/package.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "uptime-kuma"; - version = "1.23.15"; + version = "1.23.16"; src = fetchFromGitHub { owner = "louislam"; repo = "uptime-kuma"; rev = version; - hash = "sha256-/UAou+l7ppXU3t54YYdDZcXUNvEw7VGcn/OVPXdFdj0="; + hash = "sha256-+bhKnyZnGd+tNlsxvP96I9LXOca8FmOPhIFHp7ijmyA="; }; - npmDepsHash = "sha256-KaOnlqvfGatrdEqtw2Y0SudLuyzU6yC78DWn3+EZcec="; + npmDepsHash = "sha256-5i1NxwHqOahkioyM4wSu2X5KeMu7CdC4BqoUooAshn4="; patches = [ # Fixes the permissions of the database being not set correctly From 750a978e091a0a8801cf9e1aed794a9619d0867f Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 19 Dec 2024 22:11:04 -0600 Subject: [PATCH 136/146] vimPlugins.moveline-nvim: move to separate folder Already wasn't in generated or plugin list, had to be manually updated. Moving to callPackage in overrides with update script support. --- .../vim/plugins/moveline-nvim/Cargo.lock | 362 ++++++++++++++++++ .../vim/plugins/moveline-nvim/default.nix | 46 +++ .../editors/vim/plugins/overrides.nix | 35 +- 3 files changed, 409 insertions(+), 34 deletions(-) create mode 100644 pkgs/applications/editors/vim/plugins/moveline-nvim/Cargo.lock create mode 100644 pkgs/applications/editors/vim/plugins/moveline-nvim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/moveline-nvim/Cargo.lock b/pkgs/applications/editors/vim/plugins/moveline-nvim/Cargo.lock new file mode 100644 index 0000000000000..ed3654db09d90 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/moveline-nvim/Cargo.lock @@ -0,0 +1,362 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "bstr" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +dependencies = [ + "memchr", +] + +[[package]] +name = "cc" +version = "1.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e" +dependencies = [ + "shlex", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "erased-serde" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" +dependencies = [ + "serde", +] + +[[package]] +name = "errno" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "home" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "libc" +version = "0.2.169" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "lua-src" +version = "546.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da0daa7eee611a4c30c8f5ee31af55266e26e573971ba9336d2993e2da129b2" +dependencies = [ + "cc", +] + +[[package]] +name = "luajit-src" +version = "210.4.8+resty107baaf" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05167e8b2a2185758d83ed23541e5bd8bce37072e4204e0ef2c9b322bc87c4e" +dependencies = [ + "cc", + "which", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "mlua" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb37b0ba91f017aa7ca2b98ef99496827770cd635b4a932a6047c5b4bbe678e" +dependencies = [ + "bstr", + "cc", + "erased-serde", + "lua-src", + "luajit-src", + "mlua_derive", + "num-traits", + "once_cell", + "pkg-config", + "rustc-hash", + "serde", +] + +[[package]] +name = "mlua_derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9214e60d3cf1643013b107330fcd374ccec1e4ba1eef76e7e5da5e8202e71c0" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "moveline" +version = "0.3.1" +dependencies = [ + "mlua", + "nvim-utils", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "nvim-utils" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a9a92389a7a9f1352c8e4f739f854d09430e5b13007a22ad71bb68cea656031" +dependencies = [ + "mlua", + "nvim-utils-macros", + "serde", +] + +[[package]] +name = "nvim-utils-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "786ceed33fafdafb3933d708ddbb669eb41949b8d52c58e13fb5ec5b815da06a" +dependencies = [ + "mlua", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "once_cell" +version = "1.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[package]] +name = "pkg-config" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + +[[package]] +name = "proc-macro2" +version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +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 = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.38.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" +dependencies = [ + "bitflags", + "errno", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "serde" +version = "1.0.216" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.216" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[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.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "unicode-ident" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" + +[[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.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/applications/editors/vim/plugins/moveline-nvim/default.nix b/pkgs/applications/editors/vim/plugins/moveline-nvim/default.nix new file mode 100644 index 0000000000000..812dca19eb08f --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/moveline-nvim/default.nix @@ -0,0 +1,46 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + vimUtils, +}: +let + version = "2024-07-25"; + src = fetchFromGitHub { + owner = "willothy"; + repo = "moveline.nvim"; + rev = "9f67f4b9e752a87eea8205f0279f261a16c733d8"; + hash = "sha256-B4t5+Q4Urx5bGm8glNpYkHhpp/rAhz+lDd2EpWFUYoY="; + }; + moveline-lib = rustPlatform.buildRustPackage { + inherit src version; + pname = "moveline-lib"; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + cargoHash = "sha256-e9QB4Rfm+tFNrLAHN/nYUQ5PiTET8knQQIQkMH3UFkU="; + }; +in +vimUtils.buildVimPlugin { + inherit src version; + pname = "moveline-nvim"; + + preInstall = '' + mkdir -p lua + ln -s ${moveline-lib}/lib/libmoveline.so lua/moveline.so + ''; + + nvimRequireCheck = "moveline"; + + meta = { + description = "Neovim plugin for moving lines up and down"; + homepage = "https://github.com/willothy/moveline.nvim"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ redxtech ]; + badPlatforms = [ + lib.systems.inspect.patterns.isDarwin + ]; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 1530e2f009c31..4301c307499ba 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1760,40 +1760,7 @@ in ]; }; - moveline-nvim = - let - version = "2024-07-25"; - src = fetchFromGitHub { - owner = "willothy"; - repo = "moveline.nvim"; - rev = "9f67f4b9e752a87eea8205f0279f261a16c733d8"; - sha256 = "sha256-B4t5+Q4Urx5bGm8glNpYkHhpp/rAhz+lDd2EpWFUYoY="; - }; - moveline-lib = rustPlatform.buildRustPackage { - inherit src version; - pname = "moveline-lib"; - cargoHash = "sha256-e9QB4Rfm+tFNrLAHN/nYUQ5PiTET8knQQIQkMH3UFkU="; - }; - in - buildVimPlugin { - inherit src version; - pname = "moveline-nvim"; - preInstall = '' - mkdir -p lua - ln -s ${moveline-lib}/lib/libmoveline.so lua/moveline.so - ''; - meta = { - description = "Neovim plugin for moving lines up and down"; - homepage = "https://github.com/willothy/moveline.nvim"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ redxtech ]; - badPlatforms = [ - "aarch64-darwin" - "x86_64-darwin" - ]; - }; - nvimRequireCheck = "moveline"; - }; + moveline-nvim = callPackage ./moveline-nvim { }; multicursors-nvim = super.multicursors-nvim.overrideAttrs { dependencies = with self; [ From d5d221542a398aa308e2746c83cc3397297e7842 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 20 Dec 2024 09:42:32 -0600 Subject: [PATCH 137/146] vimPlugins.moveline-nvim: update and vendor cargo.lock We are on a commit that doesn't exist anymore and the repo doesn't currently contain a Cargo.lock --- .../editors/vim/plugins/moveline-nvim/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/moveline-nvim/default.nix b/pkgs/applications/editors/vim/plugins/moveline-nvim/default.nix index 812dca19eb08f..d388bba794a6c 100644 --- a/pkgs/applications/editors/vim/plugins/moveline-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/moveline-nvim/default.nix @@ -5,22 +5,25 @@ vimUtils, }: let - version = "2024-07-25"; + version = "0.3.1-unstable-2023-07-06"; src = fetchFromGitHub { owner = "willothy"; repo = "moveline.nvim"; - rev = "9f67f4b9e752a87eea8205f0279f261a16c733d8"; - hash = "sha256-B4t5+Q4Urx5bGm8glNpYkHhpp/rAhz+lDd2EpWFUYoY="; + rev = "570603637be8af20e97b91cf554fef29cab73ca6"; + hash = "sha256-hq/n48JC1EgJbmb6b/1jQ8MNhbcsJD3wIYaKE1UiU30="; }; moveline-lib = rustPlatform.buildRustPackage { inherit src version; pname = "moveline-lib"; + # Upstream doesn't contain a cargo lock + cargoLock = { + lockFile = ./Cargo.lock; + }; + postPatch = '' ln -s ${./Cargo.lock} Cargo.lock ''; - - cargoHash = "sha256-e9QB4Rfm+tFNrLAHN/nYUQ5PiTET8knQQIQkMH3UFkU="; }; in vimUtils.buildVimPlugin { From 32a0baebc65cc1c666f2e5848d7822509928beb0 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 19 Dec 2024 14:35:15 -0600 Subject: [PATCH 138/146] luarocks-packages-updater: add log colors --- .../lu/luarocks-packages-updater/updater.py | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/luarocks-packages-updater/updater.py b/pkgs/by-name/lu/luarocks-packages-updater/updater.py index 05824c9e07d59..402f2b0d553ea 100755 --- a/pkgs/by-name/lu/luarocks-packages-updater/updater.py +++ b/pkgs/by-name/lu/luarocks-packages-updater/updater.py @@ -21,8 +21,28 @@ import pluginupdate from pluginupdate import FetchConfig, update_plugins + +class ColoredFormatter(logging.Formatter): + # Define color codes + COLORS = { + "DEBUG": "\033[94m", # Blue + "INFO": "\033[92m", # Green + "WARNING": "\033[93m", # Yellow + "ERROR": "\033[91m", # Red + "CRITICAL": "\033[95m", # Magenta + } + RESET = "\033[0m" + + def format(self, record): + log_color = self.COLORS.get(record.levelname, self.RESET) + record.msg = f"{log_color}{record.msg}{self.RESET}" + return super().format(record) + + +handler = logging.StreamHandler() +handler.setFormatter(ColoredFormatter("%(levelname)s: %(message)s")) log = logging.getLogger() -log.addHandler(logging.StreamHandler()) +log.handlers = [handler] ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent # type: ignore @@ -127,7 +147,7 @@ def get_update( config: FetchConfig, # TODO: implement support for adding/updating individual plugins to_update: list[str] | None, - ): + ): if to_update is not None: raise NotImplementedError("For now, lua updater doesn't support updating individual packages.") _prefetch = generate_pkg_nix From dc742cb2e604e9730d674ad7a26c653ec5a083c2 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 20 Dec 2024 17:36:34 +0100 Subject: [PATCH 139/146] Revert "bmake: 20240921 -> 20241124" --- pkgs/by-name/bm/bmake/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix index 27e75d875a7c3..05729f8aa8480 100644 --- a/pkgs/by-name/bm/bmake/package.nix +++ b/pkgs/by-name/bm/bmake/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bmake"; - version = "20241124"; + version = "20240921"; src = fetchurl { url = "https://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-T2ZAYJHC+F6pZLI41p649xq0uqydykaHpxiDum3k3bI="; + hash = "sha256-s0ZXnoLSltGk2ineqFlOPuWWEwsgeG3sDziZo+ESdcI="; }; patches = [ From 1d1775804d4bc34fca204c6dba3c9e8ccbd4176b Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 19 Dec 2024 20:32:57 -0600 Subject: [PATCH 140/146] vimPlugins: update on 2024-12-20 --- .../editors/vim/plugins/generated.nix | 858 +++++++++--------- .../editors/vim/plugins/overrides.nix | 2 +- 2 files changed, 430 insertions(+), 430 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 329b0f943d8d9..a6b55c4b59e28 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-12-05"; + version = "2024-12-14"; src = fetchFromGitHub { owner = "CopilotC-Nvim"; repo = "CopilotChat.nvim"; - rev = "1fe19d1fdbf9edcda8bad9b7b2d5e11aa95c1672"; - sha256 = "1fz4mls0ixqjgc5112740nd5k3rw7f48in6q4b9l1xkif2kjks90"; + rev = "2ebe591cff06018e265263e71e1dbc4c5aa8281e"; + sha256 = "1lw43yhpbi3kl6j5lmz027yhndqjp95ms123dx9lxyqpfa6zkwr0"; }; meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/"; }; @@ -185,12 +185,12 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2024-12-08"; + version = "2024-12-19"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "71ea193cf6ee9e8021be2e8c7f277f757779c1ac"; - sha256 = "0sa7c22g072753shy3g14sq3hbs7v3d2jr12yys62kclc6abrx0r"; + rev = "a3a28bf8e43f7239316942c2f2bac6e74b28586b"; + sha256 = "0djv5hgrrsklyzkgjqnwr5sm3z05hxfcsp2jyzn1bwxgnyn6gilp"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; @@ -341,12 +341,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2024-12-09"; + version = "2024-12-16"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "b9b4131f6e2b0ab3d62f3f5dee183d170ca3218b"; - sha256 = "1z8h859ys5377myg3c6ylyvjz3sgfiqf609mwyjk1wdmpywkdfj7"; + rev = "bb03860b59f17dfada46d6d9563c48b7b12fecaf"; + sha256 = "1p8s6rpl5wgsb94c8sy7qjqfwi573imbkkb09qm03s6xxn9ix6p4"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -473,12 +473,12 @@ final: prev: YouCompleteMe = buildVimPlugin { pname = "YouCompleteMe"; - version = "2024-10-09"; + version = "2024-12-16"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "35d188247bb481ed721584612fea4736a373e8ca"; - sha256 = "0j8nc144vnmxz2nky8snfh7yvzdfd4lz57k808944qs93i7rndp1"; + rev = "131b1827354871a4e984c1660b6af0fefca755c3"; + sha256 = "14ja5wzbya8zfl66d1w0kzhpicpn9idhasral5xh9vqfmg3ql5rv"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -763,12 +763,12 @@ final: prev: astrotheme = buildVimPlugin { pname = "astrotheme"; - version = "2024-12-03"; + version = "2024-12-10"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astrotheme"; - rev = "32bdcfd450ee1ef533301cde2248adf8a9a70b3b"; - sha256 = "0s1jb06l53g0j6v9cknxhqcr6w30bk76p9rwmip42fkchxsm29nd"; + rev = "e612ee356bbf42dc28f181cb966730ed3befb1ab"; + sha256 = "0znpm60hrgmfzrpv4lfnmp6hnqi67hwvjh4zwd8nw2ln6r292gzn"; }; meta.homepage = "https://github.com/AstroNvim/astrotheme/"; }; @@ -1100,12 +1100,12 @@ final: prev: bamboo-nvim = buildVimPlugin { pname = "bamboo.nvim"; - version = "2024-12-07"; + version = "2024-12-17"; src = fetchFromGitHub { owner = "ribru17"; repo = "bamboo.nvim"; - rev = "95079e497d9697924d67c3cccb35bcee0e35e949"; - sha256 = "0d7qawspx4vq9jf4r3f9v3rpjjjppn9iqd8prdxg7rr6dzf8blb5"; + rev = "d8ea9e7f8ad77c26911eeadb66ea566e8f02e629"; + sha256 = "0dydhrkia3ihl1qc269a30dlwqbpzsgmrnmg1rdjxbffsy94l4fb"; }; meta.homepage = "https://github.com/ribru17/bamboo.nvim/"; }; @@ -1244,12 +1244,12 @@ final: prev: blink-cmp-copilot = buildVimPlugin { pname = "blink-cmp-copilot"; - version = "2024-12-16"; + version = "2024-12-17"; src = fetchFromGitHub { owner = "giuxtaposition"; repo = "blink-cmp-copilot"; - rev = "f8e12f3ec152ca7dfbdbd6f50797aac0171a46a9"; - sha256 = "1rpdzacp1m6k3ng38hb1vwnb931k5kncc10761x5ycn4qk88icq9"; + rev = "c38d3e4201b135ab290c7ad126a9720cf76c788c"; + sha256 = "1nr5r01f9c38zg4hz6h51ilh7fz388hj3a4ym4lkh0cj2bszk23p"; }; meta.homepage = "https://github.com/giuxtaposition/blink-cmp-copilot/"; }; @@ -2011,12 +2011,12 @@ final: prev: cmp-nvim-lsp = buildVimPlugin { pname = "cmp-nvim-lsp"; - version = "2024-05-17"; + version = "2024-12-10"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp"; - rev = "39e2eda76828d88b773cc27a3f61d2ad782c922d"; - sha256 = "13zcw6c7zppvbsjlr8yj3vml6ayalvhjbbqszljmn1f9hmkpwg89"; + rev = "99290b3ec1322070bcfb9e846450a46f6efa50f0"; + sha256 = "08q5mf5jrqjjcl1s4h9zj2vd1kcizz0a5a6p65wv1rc5s1fa3a49"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; @@ -2431,12 +2431,12 @@ final: prev: codecompanion-nvim = buildVimPlugin { pname = "codecompanion.nvim"; - version = "2024-12-09"; + version = "2024-12-19"; src = fetchFromGitHub { owner = "olimorris"; repo = "codecompanion.nvim"; - rev = "c70ae04bf39709b2bb91304514524ad9d452aa5a"; - sha256 = "12bm090rp091j3im5ikrmab1szh260pmkqzdil0ym2iq8f75am0g"; + rev = "f20ebfbaf64a1c6d2a3268a80431df697a4d2bbe"; + sha256 = "0czp5424f5vb03waax4qryb78xwgvmg0qrl76sjk3f0xrr7mapa3"; }; meta.homepage = "https://github.com/olimorris/codecompanion.nvim/"; }; @@ -2683,12 +2683,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2024-12-08"; + version = "2024-12-10"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "e76afe8f7976071fae308e31bf426f557a8ef339"; - sha256 = "1k3q9gqx78snggi28rly3y0zdbm5naxh75m9wy0zlpbrzb19878k"; + rev = "f4e8837878fc5712d053ba3091a73d27d96a09e2"; + sha256 = "0xhiqgcpyxin8mgg7s03lxp0bscgj3f5ln87fa9539fd9kwwlgc5"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2696,12 +2696,12 @@ final: prev: conjure = buildVimPlugin { pname = "conjure"; - version = "2024-12-08"; + version = "2024-12-15"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "f7eda878a647f05c494922cee98887db04888c35"; - sha256 = "09pfklzzvh65bb9dfrcqbs2apz5zkjbsivmd0z6l38igvxw7c9aw"; + rev = "b4b9b909814ef7a8f69be7636a2e3b3acb1d66ae"; + sha256 = "0hk8bky2amqdvl88z154ys488pd0as9qyy1fmnbzqbhrp8rwivaw"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -2732,24 +2732,24 @@ final: prev: copilot-cmp = buildVimPlugin { pname = "copilot-cmp"; - version = "2024-06-17"; + version = "2024-12-11"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot-cmp"; - rev = "b6e5286b3d74b04256d0a7e3bd2908eabec34b44"; - sha256 = "1y7qp011rm8nx5qr4r97n1zc64377iipankkmn0qz441cjin03zk"; + rev = "15fc12af3d0109fa76b60b5cffa1373697e261d1"; + sha256 = "0qyakf6wvkdxpzx63gv3p9bwafmxk87vgvcp14pfrkiznvqlpd3s"; }; meta.homepage = "https://github.com/zbirenbaum/copilot-cmp/"; }; copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2024-12-04"; + version = "2024-12-11"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "c810500b69cb8bcea58f2be635cb1340011714b5"; - sha256 = "0i5sclaa5dicyadfs7g8waclvv3lhh1a163gs7a9cd7c9md24v6h"; + rev = "d3783b9283a7c35940ed8d71549030d5f5f9f980"; + sha256 = "1ccgvy4s003w39zcyij1yxrw5961j9vhpg6kpm06rraqjhwy15jw"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; @@ -2888,24 +2888,24 @@ final: prev: csharpls-extended-lsp-nvim = buildVimPlugin { pname = "csharpls-extended-lsp.nvim"; - version = "2024-12-04"; + version = "2024-12-18"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "csharpls-extended-lsp.nvim"; - rev = "77c46fe05cbc44b292442f1a768b955a6fd01d9c"; - sha256 = "0ip87467lyninxmdympv8gdn7qv873avrmqk0ssfwpp2v9wlg3l6"; + rev = "4f56c06215d10c4fcfee8a7f04ba766c114aece0"; + sha256 = "1jnaimzc3mhqacn3cqds5zkwphn4dzqwrayv48791w0gv2wfzvwc"; }; meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/"; }; csv-vim = buildVimPlugin { pname = "csv.vim"; - version = "2024-12-05"; + version = "2024-12-15"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "8633030a2c70640d5525e9dc946b4570391346db"; - sha256 = "1613z8na4k4nsardmnwx0pd4kzrq7l1palb8kdiws0lkm7qacwv8"; + rev = "44aeb7e26e8b42f7c14c328f16ac4744ae53b22c"; + sha256 = "0caqlm4fwv1ggdwzwjqmlf7s3j20zxk1avgkh4hdpgjmf3sj7dqj"; }; meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; @@ -3092,24 +3092,24 @@ final: prev: ddc-vim = buildVimPlugin { pname = "ddc.vim"; - version = "2024-12-06"; + version = "2024-12-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc.vim"; - rev = "cdecda7fc8f2e8e91b650ad8ed241441e0161e5e"; - sha256 = "09am8pcbwngwbpn37xgs1crjca9ddhwb9x98b6kikyiw47f7fs6k"; + rev = "34ab80c3b4244c779f2487dc0efdd859f59e547a"; + sha256 = "1wk92pb1wf58vqakgkhcsl873kaa9q37n0zs4fs589cpk1frq58d"; }; meta.homepage = "https://github.com/Shougo/ddc.vim/"; }; debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; - version = "2024-12-04"; + version = "2024-12-17"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "56e1dd0d13a372f58aa9eb3de5b4075514d70eed"; - sha256 = "1g9i20lqda4nml82zgxc3v5px4f3wx2kn7q8jv2gp9gqbg2xrb8s"; + rev = "29a802d4f2009a825471a9d16571c20b6a2f2944"; + sha256 = "0kdxfxxn46hpzws0lwhwnnxb3ymy2aj7s01qzp3zlg0n4rnj4x4f"; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; }; @@ -3212,24 +3212,24 @@ final: prev: denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2024-11-28"; + version = "2024-12-16"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "e3fd5039040e3061db3b951f4448c92cbbc3375e"; - sha256 = "1s8vsylj3lcnbnp68qc6451qjpd6pw4hl1ac0m1f2mk4yx3aj5dy"; + rev = "4ff8f353ee54ee67288c1099242444ccb0ab5b69"; + sha256 = "0y9jlzbz4wmylyk2ssf7riiqd6qgjrglhsqmy3dmphpq4mqcvawj"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; deol-nvim = buildVimPlugin { pname = "deol.nvim"; - version = "2024-11-25"; + version = "2024-12-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "6d44c44332397ea5ee14ba638bbcaf83db0e9ac7"; - sha256 = "1bq389g277whb7jbq3vqr2fv7r0xnaza4i1gfvp6ixmf3vfj183v"; + rev = "610301b7bb70ee480410f5ad4cc55ff78c91014f"; + sha256 = "04a20q17abk0x466mfdrpmzj3knv1cammvd2yz77py49aji7787l"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -3502,12 +3502,12 @@ final: prev: diagram-nvim = buildVimPlugin { pname = "diagram.nvim"; - version = "2024-11-02"; + version = "2024-12-18"; src = fetchFromGitHub { owner = "3rd"; repo = "diagram.nvim"; - rev = "69be4d5866ac9805694a31fbcd928aa6e8dd23e9"; - sha256 = "0h4ynxdvz93mm4gp30mpbaaca57b96khkxhxw24ak3m6ndz4z4dw"; + rev = "33c5e36a0a47a676d817830b1fbf074d05d58478"; + sha256 = "14wgzf423rz0i5v53rd5xddfmplvpv77231ygc85s7bbapjpw4jl"; }; meta.homepage = "https://github.com/3rd/diagram.nvim/"; }; @@ -3610,12 +3610,12 @@ final: prev: dracula-nvim = buildVimPlugin { pname = "dracula.nvim"; - version = "2024-11-11"; + version = "2024-12-19"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "e6128ec3923b92bb2b16e81b4a0f04ed0308038e"; - sha256 = "19cdiibzwmmlw6m1k24d9jypjf1hy8vb63rjila885v8xgx68ffx"; + rev = "515acae4fd294fcefa5b15237a333c2606e958d1"; + sha256 = "1sr09v6q07q111pbcm8nc12mvgzb5f5n7bg8frrwb6dpspj4h97n"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; @@ -3646,12 +3646,12 @@ final: prev: dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2024-12-08"; + version = "2024-12-19"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "321cbc7a6be672f15e3ec5ceaab7a90b4dec6122"; - sha256 = "1jjdl63byir1pvndmhmxl5xjvjk76kv86w77sfznzy3k0bczwz7a"; + rev = "b3b085e936ba1578ee2ae02de44274f96fbb5e07"; + sha256 = "0jwkp4ykz2w67p5p1qh8xylivj7f3mnhhn3wxgxsaf2g4zyz2f11"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3912,12 +3912,12 @@ final: prev: fastaction-nvim = buildVimPlugin { pname = "fastaction.nvim"; - version = "2024-11-20"; + version = "2024-12-18"; src = fetchFromGitHub { owner = "Chaitanyabsprip"; repo = "fastaction.nvim"; - rev = "24255a74e0d35f1e1807aa78997f5c31ae419dbc"; - sha256 = "0w3fxz4af0wryr7sx7w3b14iswm56rsf76c31f9vrw4pg3nmgqa3"; + rev = "886e22d85e13115808e81ca367d5aaba02d9a25b"; + sha256 = "0zz9jc2nfyn43idwz63xcacgyaclsvddsjnk8vjgifga4m7v2r6l"; }; meta.homepage = "https://github.com/Chaitanyabsprip/fastaction.nvim/"; }; @@ -3936,12 +3936,12 @@ final: prev: fastfold = buildVimPlugin { pname = "fastfold"; - version = "2023-03-21"; + version = "2024-12-15"; src = fetchFromGitHub { owner = "konfekt"; repo = "fastfold"; - rev = "ab3d199d288a51708c3181a25aba1f9de2050b89"; - sha256 = "1fw00kwpc1jnh2py4xb8wcxq4vsd4b4qri1xpx7bvc81k0zgzwyk"; + rev = "fff6d05064dec4d7e1398aa507db35fcd57edfb4"; + sha256 = "11s9js2cavqihmk4shskmk9hvdk4hq9gypy5b14r169ly64rhg00"; }; meta.homepage = "https://github.com/konfekt/fastfold/"; }; @@ -3996,12 +3996,12 @@ final: prev: fidget-nvim = buildNeovimPlugin { pname = "fidget.nvim"; - version = "2024-10-29"; + version = "2024-12-16"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "e2a175c2abe2d4f65357da1c98c59a5cfb2b543f"; - sha256 = "01ilp9nidqaw9am5qdyga14gnnpsqi82f45ng273dqbrfn86n03x"; + rev = "9238947645ce17d96f30842e61ba81147185b657"; + sha256 = "1117w5i7996vxx32vibb09zpzzgwaipj5ldkdgck3ds5vkcdlk53"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -4032,12 +4032,12 @@ final: prev: firenvim = buildVimPlugin { pname = "firenvim"; - version = "2024-09-25"; + version = "2024-12-15"; src = fetchFromGitHub { owner = "glacambre"; repo = "firenvim"; - rev = "64f9389b88c8b0c7667d45c171a5f25c42d852fb"; - sha256 = "11c5fxpnmfqan5rjwzljz23n47g4iik4rphsknb05hycl4baapfs"; + rev = "dd2d6f6b3b87b3726d5ef59adfe8a6c444889dda"; + sha256 = "0hp7gl0vmmfr5kzmjwljalbh6cn4k15a8il2yc7irrp7ak58nzfs"; }; meta.homepage = "https://github.com/glacambre/firenvim/"; }; @@ -4141,12 +4141,12 @@ final: prev: flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2024-12-06"; + version = "2024-12-14"; src = fetchFromGitHub { owner = "nvim-flutter"; repo = "flutter-tools.nvim"; - rev = "818ad42b204cda5317baa399377ea30b35f6f8be"; - sha256 = "1ishmamdbc8w343992xb4g3889g30pnx7jzdpxcvaaz74nyg8xn4"; + rev = "85492bee069af1155bb10bfbee90ac7d4168eced"; + sha256 = "1mfp32azhvnmfnr5kv98vyq207llgyi2k9gnbdwnbvl18580v69k"; }; meta.homepage = "https://github.com/nvim-flutter/flutter-tools.nvim/"; }; @@ -4334,12 +4334,12 @@ final: prev: fzf-lua = buildNeovimPlugin { pname = "fzf-lua"; - version = "2024-12-09"; + version = "2024-12-20"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "0063769312e913b5de9f2db21285d806dcf4efcb"; - sha256 = "14awics36c15g7gzv0059xwppn7isxk2fsn9bma519pl80zqpzn8"; + rev = "7de67daddd5d4cd7757481d5fdc2a879b7ced1ad"; + sha256 = "08rry48ipdz4mcbf834ips3y29lk54k7iqhzzgan1b7iqk3x0j70"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -4717,12 +4717,12 @@ final: prev: grug-far-nvim = buildVimPlugin { pname = "grug-far.nvim"; - version = "2024-12-06"; + version = "2024-12-14"; src = fetchFromGitHub { owner = "MagicDuck"; repo = "grug-far.nvim"; - rev = "3707c4fb6ac982a1ca013c1b3bffa8e396f775cc"; - sha256 = "11ypqfmgkqkhfm8wxcd93g8cfb681f99519j52bk9ksbgigcbx2s"; + rev = "11d0fbd6fff6f4e394af95319deeaab4ef88ce97"; + sha256 = "1hmbi19biy4ypp8y8sx07idch2q1ha7anip46kjxkzy33aim2i8f"; }; meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/"; }; @@ -4777,11 +4777,11 @@ final: prev: gruvbox-material = buildVimPlugin { pname = "gruvbox-material"; - version = "2024-11-18"; + version = "2024-12-18"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "170148af9350f578f3623f810e54698fa1e5bdbf"; + rev = "b95c102f683d6402f84c8e492d3b0641c2d273e4"; sha256 = "13cl2njp5n3ml7qn5v5hhy2cz0a612j78srgg22s0nda1a7fyjm8"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; @@ -4813,24 +4813,24 @@ final: prev: guard-collection = buildVimPlugin { pname = "guard-collection"; - version = "2024-12-08"; + version = "2024-12-10"; src = fetchFromGitHub { owner = "nvimdev"; repo = "guard-collection"; - rev = "3fc9473fa5341dacb39a88e4525b983e8cee402c"; - sha256 = "0g29vf88dsqcym0nwjrzldr1ppkv3ahhngzkgc2w1hcg6mc1mc8i"; + rev = "5bfccbcebec042512a44fc1371927472254fa148"; + sha256 = "0z00jx4yafk57dp3m5hx63bsk1350gdfhzfi4d3m6i243fmnjrf9"; }; meta.homepage = "https://github.com/nvimdev/guard-collection/"; }; guard-nvim = buildVimPlugin { pname = "guard.nvim"; - version = "2024-12-07"; + version = "2024-12-13"; src = fetchFromGitHub { owner = "nvimdev"; repo = "guard.nvim"; - rev = "6fe0cd597830c27d4dd101f5a4ae1dfdf9010813"; - sha256 = "0qlzs40whw4w1n13x11szrszy2wyn9vygrnjg1h5vj70r3k1525b"; + rev = "0a6d015d542a923feedfffaaeabaad2becb87ebb"; + sha256 = "0vlk392bzg9cl1lf1f80gwf5sk64m8jszncyf013va13rw07qxdq"; }; meta.homepage = "https://github.com/nvimdev/guard.nvim/"; }; @@ -4885,12 +4885,12 @@ final: prev: hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; - version = "2024-10-12"; + version = "2024-12-19"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "027d6f991927a71bd510a7673ae5bb404ca2a1c7"; - sha256 = "1vpxrcrw8hh6jcs74ykvld4rk7dhvjp0k4sd7jqn5ijj73h3ah48"; + rev = "511e98c3e8c782b2b4e4795568a878d813547d06"; + sha256 = "1lp1dvxgv298jxs8dpk1iqxmdyy4bqbs8p2pdcfvrgh1yn4chhs7"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; @@ -4932,12 +4932,12 @@ final: prev: haskell-scope-highlighting-nvim = buildVimPlugin { pname = "haskell-scope-highlighting.nvim"; - version = "2024-07-02"; + version = "2024-12-18"; src = fetchFromGitHub { owner = "kiyoon"; repo = "haskell-scope-highlighting.nvim"; - rev = "9f0f9ee26a011c3567865cdcc0443318de281ad3"; - sha256 = "1npaanvvgnqpra4wbnxjffjdvw3mks8si42pnl5pj5snascbigv5"; + rev = "0b6238e1c5b2a53093e7d99a433ecdd4efff5db1"; + sha256 = "013fa6vdjgw5jl7h9yvi68v8awg2zznrxz5gfgl6i1cv9ry2l900"; }; meta.homepage = "https://github.com/kiyoon/haskell-scope-highlighting.nvim/"; }; @@ -5065,12 +5065,12 @@ final: prev: himalaya-vim = buildVimPlugin { pname = "himalaya-vim"; - version = "2024-09-10"; + version = "2024-12-10"; src = fetchFromGitHub { owner = "pimalaya"; repo = "himalaya-vim"; - rev = "f25c003e8fe532348b4080bf8d738cfa1bbf1f5f"; - sha256 = "0dv6mxwq6yv6if1lfb45j49rl6bghyr1hn1xfbz9g9cbb7fna2x1"; + rev = "0e5d3395441301538c1830366f3212ed55b1d315"; + sha256 = "121w94vgqvkagz7m3m2p5c0mm9gvc6p926d38kxqpcbw1lzfhw2v"; }; meta.homepage = "https://github.com/pimalaya/himalaya-vim/"; }; @@ -5149,12 +5149,12 @@ final: prev: hover-nvim = buildVimPlugin { pname = "hover.nvim"; - version = "2024-10-30"; + version = "2024-12-11"; src = fetchFromGitHub { owner = "lewis6991"; repo = "hover.nvim"; - rev = "f8e162daccb2f117e19f3d5ad3647ac0cefb02e3"; - sha256 = "0wha33yba63k15cv4k7ckbsd6qszfcjb5i4km6i2r98dq59mhar0"; + rev = "140c4d0ae9397b76baa46b87c574f5377de09309"; + sha256 = "0z1ff8awna7pk13k56xc4vsdwcn3rbsr5j80p8aq1nkm521j5q5p"; }; meta.homepage = "https://github.com/lewis6991/hover.nvim/"; }; @@ -5305,12 +5305,12 @@ final: prev: inc-rename-nvim = buildVimPlugin { pname = "inc-rename.nvim"; - version = "2024-11-28"; + version = "2024-12-15"; src = fetchFromGitHub { owner = "smjonas"; repo = "inc-rename.nvim"; - rev = "1871ca49ae6ee3e9ebee37955ba10c7b1425974f"; - sha256 = "11hrqx1jyg8av0rrvk186djnbcq8ksykja5jphjr3xcgp0x0v1mm"; + rev = "f4e13df6e2d0b3177a7305dbc1cc7f7ea44b94f1"; + sha256 = "1j847dxl739p5yzi7qh8hw3zb695j41mima9wzc5bzay0y2s6abc"; }; meta.homepage = "https://github.com/smjonas/inc-rename.nvim/"; }; @@ -5473,12 +5473,12 @@ final: prev: iron-nvim = buildVimPlugin { pname = "iron.nvim"; - version = "2024-07-10"; + version = "2024-12-12"; src = fetchFromGitHub { owner = "Vigemus"; repo = "iron.nvim"; - rev = "e6b78ec1bc56eab63b3a9112d348b3d79836b672"; - sha256 = "05qi8klifccrdl1pv9005hiz42n2w7if192qskgx6r88p6fspds8"; + rev = "916538ebf75b8ede8e0feef4f4cd88d5cc82a67e"; + sha256 = "1bwg424fgrlg7c9f3r0xdmayi9a50ybrgk85idwmmhhxz99jcx90"; }; meta.homepage = "https://github.com/Vigemus/iron.nvim/"; }; @@ -5776,12 +5776,12 @@ final: prev: lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2024-12-07"; + version = "2024-12-13"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "014d1d6d78df4e58f962158e6e00261d8632612c"; - sha256 = "022x4b6lz52dpscqrdw7l70z8m42w5gz2rzr386a1s7c9qq8lii8"; + rev = "7e6c863bc7563efbdd757a310d17ebc95166cef3"; + sha256 = "1xp6da2jg09428280015kpqblm5qms6bhldlwvfwhw9hlxkvmj73"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -5800,24 +5800,24 @@ final: prev: lazygit-nvim = buildVimPlugin { pname = "lazygit.nvim"; - version = "2024-12-06"; + version = "2024-12-12"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "02a7a2789fe9e660ef72bec27df342b15bcca6b7"; - sha256 = "066x3bxjbpxn83zz97xxifvvwdz652f97j8ygi38lmsmc3scwg1i"; + rev = "77a0d42943d8265271e6e6beaed72da54eeb17e7"; + sha256 = "0hhz3zzjbd8chn4dzbpvv09rxwf9h2brvzxlcp3rv9cglk72i8ym"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2024-12-06"; + version = "2024-12-19"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "202513a398e780dac32d36159181a8299d9cfd12"; - sha256 = "1abdlqfd3r9mp7dls6nl20znwixzmavy4m5yg04j2incjzpn298d"; + rev = "e5b541dba61d628f247bedef0ef39548f9f17e79"; + sha256 = "0faw8fkl7hgw0c9l46ss61j6aas8nzbgmlhw20kga4v1bjfnzq6m"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -5860,24 +5860,24 @@ final: prev: leetcode-nvim = buildVimPlugin { pname = "leetcode.nvim"; - version = "2024-12-02"; + version = "2024-12-18"; src = fetchFromGitHub { owner = "kawre"; repo = "leetcode.nvim"; - rev = "98136532e61f6eb6a51b8130a8bbf73ccdee3d51"; - sha256 = "0jirmzg5vy626xcv7xw7m9b5gg0xndlr3xzyry52r60pzyzly1ph"; + rev = "db7e1cd6b9191b34b4c1f2f96e4e3949cde9f951"; + sha256 = "1d3lb7625b2qdzqm74mzrac66rxqc0qgjd3mb37l4v8wqyiyv6pp"; }; meta.homepage = "https://github.com/kawre/leetcode.nvim/"; }; legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2024-12-06"; + version = "2024-12-14"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "ba8452081f63548ce30a8bbc94369c3764cee33c"; - sha256 = "1lrssyd9kxix127m97pqmvpabz9791zj42ki2jlkb3vnbhcraq94"; + rev = "58dc0e3a99b76d6f1386d8da2cd985d7e2804dd4"; + sha256 = "0vql1x6llcf4jqr9zn42wrkxji913b1qpk6gvf1rhsj383kbschq"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -5944,12 +5944,12 @@ final: prev: lh-vim-lib = buildVimPlugin { pname = "lh-vim-lib"; - version = "2024-11-26"; + version = "2024-12-13"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "b8d79fe7733c9ed5205e68aedfd63cd774c69a07"; - sha256 = "1idcdv3qzqp6c1nd8q87bjs9768d26xdar3909iwpa4bi97qvx1c"; + rev = "47c53803edae240c3b334009b1f844df153d60dc"; + sha256 = "07q9qz345flx5m87drx6c3fv6sylylvhq84nygr133sc0i9jgcs9"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -6244,11 +6244,11 @@ final: prev: lsp_lines-nvim = buildVimPlugin { pname = "lsp_lines.nvim"; - version = "2024-05-19"; + version = "2024-12-09"; src = fetchgit { url = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; - rev = "7d9e2748b61bff6ebba6e30adbc7173ccf21c055"; - sha256 = "1w1nmh3nkci7w1apk0mx5sdwlgi4ilkgx3cgxl79iv5bwwyfdjs2"; + rev = "f7f18b85360b8e85cd6a5418c9fbccb6a2ff4b1b"; + sha256 = "1c2fjv5gqi8ydal78imq9abmj10xk3kams180agvypaxrva09avk"; }; meta.homepage = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; }; @@ -6303,12 +6303,12 @@ final: prev: lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2024-12-09"; + version = "2024-12-10"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "aa1a9ef63a6baa37b2e59c08c78bdd4b8b22ac6f"; - sha256 = "1mbzklvd6qrl2wp7psrlv97z7rw7n43zbi32jqfbfmb69wn2dwfl"; + rev = "2710a0ad97b5aaff404cd4756c296df454b3f726"; + sha256 = "09jn5h90zn7vn32w5hsh035r9ngscqbvwzz14ss6yca3ry1xgakr"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -6869,12 +6869,12 @@ final: prev: mini-files = buildVimPlugin { pname = "mini.files"; - version = "2024-12-02"; + version = "2024-12-12"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.files"; - rev = "84efb81e5207ae8c41f54abdafb79c6212fc0971"; - sha256 = "0b73v72hpa74ziw2b62cf4kd9g5dwj8v4bbpjwchxj5b7garjkrd"; + rev = "72cc9045c1011f2c158117bd5a0d339792b7f34a"; + sha256 = "0lxh0xqiz5l0ppfhgn48swcbmbwp0g1mjrbj19skyl8g26nxmywp"; }; meta.homepage = "https://github.com/echasnovski/mini.files/"; }; @@ -6929,12 +6929,12 @@ final: prev: mini-icons = buildVimPlugin { pname = "mini.icons"; - version = "2024-11-10"; + version = "2024-12-12"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.icons"; - rev = "54686be7d58807906cb2c8c2216e0bf9c044f19a"; - sha256 = "1z7afyybja4vn1hzlv4cav4flh7jwhkc9ghhlharh1llydww5831"; + rev = "44c0160526f7ae17ca8e8eab9ab235d047fcf7a6"; + sha256 = "0vb17z2scyds9bqwyiaknrbwrvdxq7sdsbjny9rgqbx7v6g8w5j7"; }; meta.homepage = "https://github.com/echasnovski/mini.icons/"; }; @@ -6989,12 +6989,12 @@ final: prev: mini-misc = buildVimPlugin { pname = "mini.misc"; - version = "2024-11-04"; + version = "2024-12-13"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.misc"; - rev = "fd74400b22f669e9b32bef144e9e8c54edf85943"; - sha256 = "194k31fhb5qszg6gn1w7hmlxrw7p7qyr3416ii0d3vw4v79kqwpv"; + rev = "645fb9367c19bb485902e54e5451425981498601"; + sha256 = "0xy9sn0vjlaw0lk6l59drksqypz6yncmdrhach387mv4hvh1lxma"; }; meta.homepage = "https://github.com/echasnovski/mini.misc/"; }; @@ -7025,12 +7025,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-12-08"; + version = "2024-12-13"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "2435d0de00174a45d6b352fefeaa6008ebe9f23b"; - sha256 = "15n2x6iiamh44pkqf6slx0ly1l4fpar3y0lscdjsizw8hwp8l2v2"; + rev = "7ebfab26d77a4b9b05aaae565907e7fa4b2ee154"; + sha256 = "068hc5sbpdrp3daq0ls9zbyj1vinpa9r4ghz0mz46xmrsfybchfh"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -7073,12 +7073,12 @@ final: prev: mini-sessions = buildVimPlugin { pname = "mini.sessions"; - version = "2024-10-18"; + version = "2024-12-12"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.sessions"; - rev = "c9c633f3e423885f91c49e3b9e8e6141af25429e"; - sha256 = "0ds8dx3gazmsvdmj50mlfan9xzvak87rx96cg1kpwqjw06y972pf"; + rev = "427c84e16c3d7363e2a4879c0efd2a3f6a62ff75"; + sha256 = "1zsjkl98yj3a1ixhhhfy63wk27dn2i683cr45z8kdzx6npp9d2y9"; }; meta.homepage = "https://github.com/echasnovski/mini.sessions/"; }; @@ -7277,12 +7277,12 @@ final: prev: monokai-pro-nvim = buildVimPlugin { pname = "monokai-pro.nvim"; - version = "2024-11-20"; + version = "2024-12-16"; src = fetchFromGitHub { owner = "loctvl842"; repo = "monokai-pro.nvim"; - rev = "d79eef3cbbd2e8323e9c2131a912c0131b6dbc85"; - sha256 = "0xnw3xad51147q5qij3qvijrx6y2ayx83frfn95zsz32z9k2w3g2"; + rev = "6c15e36834a624a32f46c6db8f9fc063995b24b6"; + sha256 = "16zhqymbdj70h7j3b14ygl6mzcsnkynxig15g7fi1zf5liwr1px8"; }; meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/"; }; @@ -7589,12 +7589,12 @@ final: prev: neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2024-11-24"; + version = "2024-12-16"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "42caaf5c3b7ca346ab278201151bb878006a6031"; - sha256 = "0bw0ilqd6mvxn5fa1aak5dzk4259hzwxpypv808kfxjvj676h16z"; + rev = "d7266e467de1adbaf775cbd4bff9b68842e27386"; + sha256 = "091wvn42a9dllkdgwjjc3prg63h2aq5f0yvckpvaaisg14kq9hhr"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -7613,12 +7613,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-12-09"; + version = "2024-12-20"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "f5e58a7db0e19658c35dd409c3d4e835c14ff876"; - sha256 = "1cz56dw7lh4vrii5yzxsfkmv93l0plpfx7hw2l2hbv4h8pk10m4b"; + rev = "a9562ad062a1611a10cc81815b220a4450fb2cad"; + sha256 = "1dpy4bxcq9swakdggr15kh2b95zjvz7vv26jv6vj4pqqc8mjbwlf"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -7685,12 +7685,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2024-12-09"; + version = "2024-12-19"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "40038473707c54a846bd11ecaf5933dd45858972"; - sha256 = "19327h9syimfx36g4c86dasj12b1ai78912hnc3afs4bcawn8z2q"; + rev = "0820552997dd4dda4faa147228f0e61ea88290a3"; + sha256 = "1bz8nh1cqz8hjyfvf2xsrxxj82rihj2pia28ycz14qzlmlv2b6kf"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -7915,12 +7915,12 @@ final: prev: neotest-golang = buildVimPlugin { pname = "neotest-golang"; - version = "2024-12-08"; + version = "2024-12-19"; src = fetchFromGitHub { owner = "fredrikaverpil"; repo = "neotest-golang"; - rev = "148cf3145dfac42fe7ff21d7c96bce1a7802d7c1"; - sha256 = "12gp83a96y3fk2z80gaq0br2p556w9avmp4vqr0lqb29q6aqaq7i"; + rev = "722b6116b4c9201a97edb06565ebed797f88441d"; + sha256 = "0z9wj5gan2503s46x3q89zbbx3rk9p2bvx98ghrc8yz9p1990y8x"; }; meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/"; }; @@ -7952,12 +7952,12 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2024-12-08"; + version = "2024-12-15"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "af2b3a37d46cbfb50735da306a7b584c6a643716"; - sha256 = "01x5rmh83x9h8jd8c2zw2r1kihbw9byn1a2fy1hmm6jg65lk1wr5"; + rev = "cbc00ce8aa15fa0e1147472953a099599643dde2"; + sha256 = "0dbcmbh74f21ixq1ihdmp7a70q3ax3f0p93kpn5307akp7wryr3v"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -8072,12 +8072,12 @@ final: prev: neotest-rust = buildVimPlugin { pname = "neotest-rust"; - version = "2024-11-18"; + version = "2024-12-18"; src = fetchFromGitHub { owner = "rouge8"; repo = "neotest-rust"; - rev = "eec7eaf8491e619fe99e620e2da3cd31b30e406b"; - sha256 = "1a3bcmgy4shpn10wx7nf5lv4zql9knlsw58ikz5ahpmm6i6c2vrn"; + rev = "e1cb22ecf0341fb894ef2ebde344389fe6e6fc8e"; + sha256 = "1l5rpl63dnsl1ys6h5fv4an6qndyk2bd55r1n6xhlgfns3amabk5"; }; meta.homepage = "https://github.com/rouge8/neotest-rust/"; }; @@ -8108,12 +8108,12 @@ final: prev: neotest-vitest = buildVimPlugin { pname = "neotest-vitest"; - version = "2024-08-23"; + version = "2024-12-19"; src = fetchFromGitHub { owner = "marilari88"; repo = "neotest-vitest"; - rev = "9e30dca989a2287cf3fde86b3e138ea7fa4de935"; - sha256 = "16l4i6jh8y2563062k2n5xcj4lxs9cyb2z8xvzb63il5n526mivi"; + rev = "3e338b77700853f725856c37ff5a3cf9295bffae"; + sha256 = "1n2s6hivb4xc0bvm3fbipmlzcz26ijzqcqfjgfandlm9c8sdi1hb"; }; meta.homepage = "https://github.com/marilari88/neotest-vitest/"; }; @@ -8132,12 +8132,12 @@ final: prev: neovim-ayu = buildVimPlugin { pname = "neovim-ayu"; - version = "2024-09-08"; + version = "2024-12-15"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "2839c88cd297a069e93df1aab542c087e8f6e8c0"; - sha256 = "1jzr8zfxblr92ipz0b02nvh7q44yba8f64c2lkq5qfn49cqx9lwh"; + rev = "37160699469d695486174fb863aae2f2a4c1f90f"; + sha256 = "0i91lfbhq567r7x9724k069lkj46am8qjsaad67h0rzvc705l9dk"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -8264,12 +8264,12 @@ final: prev: nfnl = buildVimPlugin { pname = "nfnl"; - version = "2024-11-22"; + version = "2024-12-15"; src = fetchFromGitHub { owner = "Olical"; repo = "nfnl"; - rev = "dc3d2772b60df2ce96816c5a3de84c116028cf31"; - sha256 = "10as8k6xlvzvl0h13skszra57yhh0a1rpczx8qvg91fh2zk91hm3"; + rev = "b65c4cf17d4e5c9b80d8c8ab33a6774a6c64e1c2"; + sha256 = "10ym54ni0rcjrnbp9cgjrhv4r099wcjsslav4ymh453whklic2ga"; }; meta.homepage = "https://github.com/Olical/nfnl/"; }; @@ -8300,12 +8300,12 @@ final: prev: nightfly = buildVimPlugin { pname = "nightfly"; - version = "2024-12-08"; + version = "2024-12-18"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "9c022bac2785d5b68c79fa28ba160244e21f0dcd"; - sha256 = "12qlfinjq7xnwbgspxwslakaqilk7dfd23k6cdfs2il6xv16mbb8"; + rev = "f1176605eb01b38d84e0e9e221c9599bd022dfd4"; + sha256 = "1z2b5v3015kl46k3cian719p5hz5qf0ga6p7n3s3fwcygy9n50f9"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; @@ -8360,12 +8360,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2024-12-05"; + version = "2024-12-19"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "bd14d0966ab0da4e38bfb3aa5d6736330adcea96"; - sha256 = "10mz22ny74prp0bj30zj51k74zjb43i4l0l9b57whcz1aggkji12"; + rev = "bc0d6575a2e51bc8055c3930b48bd600cf45ee54"; + sha256 = "1pg47w2jq5f3bxgf5i53aj6qg1hrgl1imlknd44hgdlzrsxhns4r"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -8396,12 +8396,12 @@ final: prev: no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2024-11-30"; + version = "2024-12-13"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "2a786bf7130cce20449885fb799f3c7f4ce93595"; - sha256 = "1iinas3bfwyajasw10kscfm14nm2ah5lk6nbcrc7dhx8p0k5w29g"; + rev = "5d91f31a2d583a367df97a4654be028fbe13f2d2"; + sha256 = "11d7wg75sf5b8b5mj5qx7k53m2bksp0yksagpzsjr858g2zqpyz6"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; @@ -8420,24 +8420,24 @@ final: prev: noice-nvim = buildVimPlugin { pname = "noice.nvim"; - version = "2024-12-07"; + version = "2024-12-12"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "7b1960c48078a8b2fb44a89db82f4fa637b2d7c8"; - sha256 = "11pkjv3i24anz6pz55239mzllf7g4vx376iwxgp63fnlm7i5b2yj"; + rev = "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f"; + sha256 = "0imw4ls3vqh8bg358y8ckxcbylhczr297zxhcfx6r7mf64sj171s"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2024-12-03"; + version = "2024-12-18"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "58866c670d68ef80397c317a3a1ee5f53ca646fd"; - sha256 = "11jcq0c2azqrdkfqmmh9p2six8bjgy5izj5plmjw770a9j9avlf2"; + rev = "40dc2e983560acaea29d6312b33fafba37b0c272"; + sha256 = "0v69nj7jhfq3an1xbb71i756nznd601f5drjaj9wn9qg4p3s4d67"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -8504,12 +8504,12 @@ final: prev: nui-nvim = buildNeovimPlugin { pname = "nui.nvim"; - version = "2024-12-09"; + version = "2024-12-10"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "b1b9b75a2d8041e1c2234f7448c61f8468a4258d"; - sha256 = "0hyaa7giw7f7w5smp6q46azwyp8vral51jlajgi7w1k5ijwyvazz"; + rev = "53e907ffe5eedebdca1cd503b00aa8692068ca46"; + sha256 = "1m4vlf9qcs01a8qrq3salcz966sp8cpf01gbrg8dbf255vzc8kp9"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; @@ -8552,12 +8552,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2024-12-06"; + version = "2024-12-19"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "19fe47b4ecca1f4e63323ed0c081d21fc9927a36"; - sha256 = "02r9davklc0i4kf3jl7rmk05sq7kizsjq9v7ygmgq15gg44k60z8"; + rev = "9a4ecb0bbaecd7208471c678e7dbacdeba517648"; + sha256 = "1kir0k6kiz22ii1i6p8gjfnqcd0sdhs1c23qi0j95j1g1hnlv14v"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -8672,12 +8672,12 @@ final: prev: nvim-cmp = buildNeovimPlugin { pname = "nvim-cmp"; - version = "2024-11-30"; + version = "2024-12-18"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "ca4d3330d386e76967e53b85953c170658255ecb"; - sha256 = "0x810i5yzwz9cy5g95qqsr4c1dc51chvw54qp17sq28npnadyjgv"; + rev = "98e8b9d593a5547c126a39212d6f5e954a2d85dd"; + sha256 = "1zb0a9n17ycbi12magx7h3b04pynshlc6f2jlpxmplpdgxvl2x7b"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -8756,12 +8756,12 @@ final: prev: nvim-coverage = buildVimPlugin { pname = "nvim-coverage"; - version = "2024-03-24"; + version = "2024-12-18"; src = fetchFromGitHub { owner = "andythigpen"; repo = "nvim-coverage"; - rev = "aa4b4400588e2259e87e372b1e4e90ae13cf5a39"; - sha256 = "0cxdrny3pf0bhkqqjpnxmgcxjl22g3q0ccb043hpn7zc894j0grm"; + rev = "a939e425e363319d952a6c35fb3f38b34041ded2"; + sha256 = "0v2j3wixhfnalnzp0pxnynzfkvj47mfllxl6a4bj7p2lm1fm61i5"; }; meta.homepage = "https://github.com/andythigpen/nvim-coverage/"; }; @@ -8770,22 +8770,22 @@ final: prev: pname = "nvim-cursorline"; version = "2022-04-15"; src = fetchFromGitHub { - owner = "yamatsum"; + owner = "ya2s"; repo = "nvim-cursorline"; rev = "804f0023692653b2b2368462d67d2a87056947f9"; sha256 = "1zqbykfi4mjp07y8c1kir4lxgvcaxqy9jkn558y3n1jakpk3l72j"; }; - meta.homepage = "https://github.com/yamatsum/nvim-cursorline/"; + meta.homepage = "https://github.com/ya2s/nvim-cursorline/"; }; nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2024-12-06"; + version = "2024-12-19"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "580d6e526358afd0e4bba053e68fd59cf581a161"; - sha256 = "1mbh8fa2iigjhm1nzdy2xlxpy0nkdjkvlk3g1l3xgijh4l40i147"; + rev = "7e48a80551e0b8fd7e34436d74243de7ae1ec397"; + sha256 = "189zw4n5gl20806nph4xmc5d0j25hbkn7sj7anhw6nliw2n4ryai"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -8840,12 +8840,12 @@ final: prev: nvim-dap-rr = buildVimPlugin { pname = "nvim-dap-rr"; - version = "2024-07-10"; + version = "2024-12-14"; src = fetchFromGitHub { owner = "jonboh"; repo = "nvim-dap-rr"; - rev = "1682c13a2096a4a6394c803e14f009f121400acf"; - sha256 = "sha256-QtOY6gg2grsxF6KTn75hZ+BZGWK2ahzVu9k2SIIFeJU="; + rev = "920e4931e383dddaa82539b4697b752fae7ff82d"; + sha256 = "1jmx08r1jrshijshls4jizhcplm1skjp1kxflm3505vz8dx4jrf7"; }; meta.homepage = "https://github.com/jonboh/nvim-dap-rr/"; }; @@ -8948,12 +8948,12 @@ final: prev: nvim-genghis = buildVimPlugin { pname = "nvim-genghis"; - version = "2024-12-08"; + version = "2024-12-18"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-genghis"; - rev = "88415be8bae7862ffa907df7242eae227ef81a5e"; - sha256 = "01gd8sn8651jvxzbxspcck29sf2hx5fbkqd5zmm1yqyd4z8485i5"; + rev = "f0062e8bde0e04c555ca36f515047938c92cd11e"; + sha256 = "0v1958n1cv5jk015njgw8z52ksi0hhhcl8mfqw7c6zcshl299jsj"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/"; }; @@ -8996,12 +8996,12 @@ final: prev: nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2024-11-21"; + version = "2024-12-18"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "80aa3f9959ab40d0e5bc49ca14ceea95da3a5a40"; - sha256 = "0v0svl5hz4vksidm4ymk50cfl3cpgyd5b07b4daz3039px9j8yg0"; + rev = "67f1ccad7df97041429010514d4a6b3b285328e6"; + sha256 = "0cfbrkg4nz46vj68lsdz117zn4khwyqy871vs9i977d1h1zcqr3h"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -9115,12 +9115,12 @@ final: prev: nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2024-11-22"; + version = "2024-12-19"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "6b46370d02cd001509a765591a3ffc481b538794"; - sha256 = "1gjz74g3d148j9l7a5n0mygnayflzs5i44ygl6gmd69dcmvp45d1"; + rev = "1fea92f1d9908eaa5eb8bafe08b4293d7aadaa55"; + sha256 = "11khnhy2srlq02x3xb7c33k8rbinj8s6c9k2r8m8f70xfn45qgdl"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -9163,12 +9163,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-12-09"; + version = "2024-12-19"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "b8b725659fa60d2c5f5bd7459bcfee1d8b34acd5"; - sha256 = "151kwlsx22pm8cg8l5a1bjdnsz4k17zsakbgy0h4p25m4dl5ci0w"; + rev = "040001d85e9190a904d0e35ef5774633e14d8475"; + sha256 = "16380yk3q4w6w9xs0lmjaf03p7jplaqa7mn9dgqld00536mv1qwr"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -9223,12 +9223,12 @@ final: prev: nvim-metals = buildVimPlugin { pname = "nvim-metals"; - version = "2024-12-07"; + version = "2024-12-16"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "1c6dec2505ea15b8766ad72cba52b39bb220407b"; - sha256 = "0pdgcrz0mrda7myybvb5dhmbwzdxgwk855h58zsc6f93q7384zcl"; + rev = "abf4a2b7ccdb2fa21ef59b66e50d9b69a746e3ef"; + sha256 = "0rv34hvl5q1625qpid9wlacila4gpc6w039iksjq7cp8czkds22k"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -9297,12 +9297,12 @@ final: prev: pname = "nvim-nonicons"; version = "2023-02-04"; src = fetchFromGitHub { - owner = "yamatsum"; + owner = "ya2s"; repo = "nvim-nonicons"; rev = "ceda07dc7339f35444b5f4c4016f76a9eb42ac16"; sha256 = "0kcagkzgvib0jg9aywfvrk4bx7pdyk7zj5b5i4wzacdcyx5yb7mx"; }; - meta.homepage = "https://github.com/yamatsum/nvim-nonicons/"; + meta.homepage = "https://github.com/ya2s/nvim-nonicons/"; }; nvim-notify = buildVimPlugin { @@ -9319,12 +9319,12 @@ final: prev: nvim-nu = buildVimPlugin { pname = "nvim-nu"; - version = "2024-11-14"; + version = "2024-12-10"; src = fetchFromGitHub { owner = "LhKipp"; repo = "nvim-nu"; - rev = "3a25a60e46ba07f04a5930126295ccf3f68092ab"; - sha256 = "1jilhkgx54nqc52l6z1fpsm8jr26pvwq7ds5ids1j0mdbd17irgn"; + rev = "161b005944e1d0704d1c8c83dcfc9b6b459a2d2d"; + sha256 = "03zvbfpwslvra00sbr8jk9ydm3b5j6iqg32rhps964lr5bascvlr"; }; meta.homepage = "https://github.com/LhKipp/nvim-nu/"; }; @@ -9415,24 +9415,24 @@ final: prev: nvim-rip-substitute = buildVimPlugin { pname = "nvim-rip-substitute"; - version = "2024-12-06"; + version = "2024-12-17"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-rip-substitute"; - rev = "afa6d8d2dd426eba90d0cd1c6cef6d6b88c5d8f5"; - sha256 = "183aiz3zjys1gygcinl133svg7hdsbism6r8gaklabqjsqblkwj1"; + rev = "a037e1a81817ad79494e0ced307325f98ad37c06"; + sha256 = "1gai0jhscw2xblx39jprwgdhp5d728nbja7j4qx8mrmrfk1fmb7f"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/"; }; nvim-scissors = buildVimPlugin { pname = "nvim-scissors"; - version = "2024-12-03"; + version = "2024-12-17"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-scissors"; - rev = "cfff670e4b6cc05d3c47e096e11a0f479eb93447"; - sha256 = "18x93q9c8kgwyp87nlmbp1dqniwb8yh3zc5mrczvcps9a4yjdq5j"; + rev = "01f78a23885b168251aba2e74d94739ea6b7545c"; + sha256 = "0cdd0n90wkhfihnhsskn2vykm15n4zblnjlw0w7ksm8656x6nhwl"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-scissors/"; }; @@ -9451,12 +9451,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2024-11-26"; + version = "2024-12-19"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "4d60c594d78e97189c1e38720e74f13c6f5c311f"; - sha256 = "0x7w1y95pz3f3jy97qrj2vww00n2drxw5g2hxs0x9s2vzqcxi42p"; + rev = "00afa982055fc7547d13a68b341ad160d1c67a18"; + sha256 = "116cgm7mpakw3brc3s3pidn255shi8ag33w85jq4qjawgkvjxi05"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -9523,12 +9523,12 @@ final: prev: nvim-spider = buildVimPlugin { pname = "nvim-spider"; - version = "2024-12-03"; + version = "2024-12-17"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "8b9dc30243336655699179fd095841adb29434cd"; - sha256 = "0hy0q443s9lfaln001rr0z1lka9agaczppmx9mjcwwycq2x35k70"; + rev = "c61aca1d9541e1d14083e1e23e20c01c53c98668"; + sha256 = "0vnccv7zvh96nbn01l33nhdsl1fcwxjl21kp1r0fnz7idwd0yrl9"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; }; @@ -9583,36 +9583,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2024-12-08"; + version = "2024-12-13"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "db8d7ac1f524fc6f808764b29fa695c51e014aa6"; - sha256 = "0pzy1bl5901q8ahpaxxg3k5pjmgix2jc5l0fckmwsh6239g334nx"; + rev = "f7b76cd1a75615c8d6254fc58bedd2a7304eb7d8"; + sha256 = "1v1naz9vplwa2h7hwrlj23i6iw084rlvrsfvc9jp9qhmbmbnr537"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-12-09"; + version = "2024-12-19"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "0c26a5c4bc407fdbca545ab25cf6084fd069444b"; - sha256 = "1cm2npwr747cimri67yh1rhncw51jg77nk1a9fncd9zpxw4i24j7"; + rev = "fa915a30c5cdf1d18129e9ef6ac2ee0fa799904f"; + sha256 = "1cskvl5pp1w29hsinbcdpjjdhlj92xaqqr3cy0vcqvdywv5mhq22"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2024-12-08"; + version = "2024-12-11"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "3288c5af7d3820d716272f1d05ab661cc540a5d6"; - sha256 = "11jsm6xqflzjrv0n60sqgdaq6i02135q1k46wybxgq407l7n4i6l"; + rev = "8fd989b6b457a448606b4a2e51f9161700f609a7"; + sha256 = "18zlwxm1321kzr307jnxwkq58k4zd5jz112pj2vb2aib5vhsprqp"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -9727,12 +9727,12 @@ final: prev: nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2024-12-02"; + version = "2024-12-18"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "95cbe2e99901135704aabdc8732d722cf68b12c9"; - sha256 = "01yf6675gd0chlpzwpcm7j1693hb57jwjs92cw6nkmhm33p7zpsf"; + rev = "270ca542dae992ffe40274718c63645217ebc8bf"; + sha256 = "1rw5mj9yfmmyfhdn2ac1zq5vys027sbj8dfwlq42y9z250gh30nc"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; @@ -9751,24 +9751,24 @@ final: prev: nvim-various-textobjs = buildVimPlugin { pname = "nvim-various-textobjs"; - version = "2024-12-07"; + version = "2024-12-17"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-various-textobjs"; - rev = "46b24fa452848da962d1496561f6c15d8f27f054"; - sha256 = "024738lqcxi6xzvazxgq31h8bci8dawmlvymznvnsknmjgfb27f5"; + rev = "157b5d7f0eeba38be01d940bfb1449eb90b4eac9"; + sha256 = "1amw6mq95x4d8aiycw5xg4cqfd5ixj31xg9fxmxny7dhfl8rd4zc"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-various-textobjs/"; }; nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2024-12-07"; + version = "2024-12-16"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "87c34abe5d1dc7c1c0a95aaaf888059c614c68ac"; - sha256 = "1kkrnsxja92kvrk5lh8sldad4wcnhwgpcpiqhwzn2pg2xda14a08"; + rev = "0eb18da56e2ba6ba24de7130a12bcc4e31ad11cb"; + sha256 = "0xhd4wyr0g6r0hpjlsplclx36yndgj4b7q6shfjfdp68sbqw6hir"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -9871,12 +9871,12 @@ final: prev: nvzone-volt = buildVimPlugin { pname = "nvzone-volt"; - version = "2024-12-01"; + version = "2024-12-14"; src = fetchFromGitHub { owner = "nvzone"; repo = "volt"; - rev = "e01090ff27b34288574c24a09cb166e47c4a0c3d"; - sha256 = "0xwqzlmlwf1qq7m8by0hy88njh4xpvz7fxxy7znqd014jkvz0v9d"; + rev = "0cdfa1dfbbfc8fda340054915991fda188db8d8e"; + sha256 = "0rfagy7mqf2hvcic8zs80na437swhm3fdw8if56iaym4gbm0xipy"; }; meta.homepage = "https://github.com/nvzone/volt/"; }; @@ -9919,24 +9919,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2024-12-07"; + version = "2024-12-19"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "111979671dd0aa9281f50867901cef9792a7b2d6"; - sha256 = "1fvc4sfjpiq0klyngzmck1c0bvym74f369rxw1z1hvzp1jh1153i"; + rev = "cb6a548f0ce181992f045ca50a71e634e37da024"; + sha256 = "0ypanqmalndqhgi0zrrfrf7vransvap88lc8ap050lqf7c3a9azq"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2024-12-03"; + version = "2024-12-10"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "9a59256c8e88b29d2150e99b5960b2f111e51f75"; - sha256 = "06b0j6vrih5nh5hw52vc55pywzi01m57v2r6p52p783aqbpp22p9"; + rev = "dba037598843973b8c54bc5ce0318db4a0da439d"; + sha256 = "0zhxcwh40pqxgkv45hv47paz2635bkcj7vpdi1p2bkbpp1dd3krc"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -10040,12 +10040,12 @@ final: prev: onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2024-12-09"; + version = "2024-12-11"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "ac314ec2df0d58023f7a35c8bf1c780140d34110"; - sha256 = "02qmadv61hcnmi98rkr6frmjh8ds57kch2zai8vb2rw0jzbmiy5w"; + rev = "e9b44b946bb7760f8125e3bfc648deebb9328e52"; + sha256 = "08lcj8v3zim3qmak0llxni2pwkc65bnisvvwp5p7mixlyqmi2gga"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -10064,12 +10064,12 @@ final: prev: onenord-nvim = buildVimPlugin { pname = "onenord.nvim"; - version = "2024-09-21"; + version = "2024-12-19"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "7f8a7482a1145c1286ee05d46ef4d028a4f7264a"; - sha256 = "17c1kvqkh483h7hxpxyn3xc0cwhxlmjs5pvav6gf5rbq88ddc2kk"; + rev = "97f28a6005249476a090d97ccd44a82520dcdfe4"; + sha256 = "05zv81rfg2k8zicwbvnaji3143vbyxb9j5kcdz8vwwwyb6s40j1g"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -10124,12 +10124,12 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2024-12-06"; + version = "2024-12-18"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "6c394695343cd1af048ce5f308f53908d097b1e8"; - sha256 = "1qkgi1m0ip1xwgrf7nss1k7qhj2cjbbclpxnfjd9ybn5fbnrlk5x"; + rev = "07c479c993d7e3d40166b2cfa0e27b8b7a3604d1"; + sha256 = "1mpn9ivn6wi8d9ywlkrrr6b5rhla1hrf6lllihqd5979l8i3lcim"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -10148,12 +10148,12 @@ final: prev: otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2024-08-25"; + version = "2024-12-17"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "ca9ce67d0399380b659923381b58d174344c9ee7"; - sha256 = "1dlqb6ihif3s5w2pydw1iinwhsn8z1in7jxqhrzv274nmnhg1qbs"; + rev = "7edd39c920f7a28ac711a7c658a7cfdfb804bc82"; + sha256 = "0njc4q1b9xkj7il01j2j2gfjjl3rgnn9ax4dkixj15yh160zs1li"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; }; @@ -10305,12 +10305,12 @@ final: prev: persisted-nvim = buildVimPlugin { pname = "persisted.nvim"; - version = "2024-10-17"; + version = "2024-12-15"; src = fetchFromGitHub { owner = "olimorris"; repo = "persisted.nvim"; - rev = "e9a179271b1c7888e0a87448b3cf81652a6606c1"; - sha256 = "1d0yyl9qm0diwmz0ma44x8sj964qq82hrc0pyz9lg8qmpi9di093"; + rev = "1473f182c36b6de0bf04d5eaac5c049e604f9d7b"; + sha256 = "0s04p909rf9d0v45z99kipd76hgrdnfnx3rzipnajfb2zcglc5wf"; }; meta.homepage = "https://github.com/olimorris/persisted.nvim/"; }; @@ -10582,12 +10582,12 @@ final: prev: pum-vim = buildVimPlugin { pname = "pum.vim"; - version = "2024-12-09"; + version = "2024-12-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "pum.vim"; - rev = "774d3daba7239aef39b22e22658a57a9fe366e87"; - sha256 = "095ksadph8z8jfyk6bsf5gjfpjpzi0qbblpf813k3mvjm6gkpymw"; + rev = "97f431fc75d20d824b963e1fe751df55e423e05a"; + sha256 = "0qz8gn3yrf3wzn9jzizfrbrcvfl8dffdssnphjrnglshmsqddd11"; }; meta.homepage = "https://github.com/Shougo/pum.vim/"; }; @@ -10739,11 +10739,11 @@ final: prev: rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2024-12-04"; + version = "2024-12-15"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "e9dfb4582b9ca0ab7e987c65999f662242bd6f61"; - sha256 = "00x9n9wvl6mmq23mr7jqa9xnd0bgm75c402l5hak9d8f4npj4nba"; + rev = "77e5bad54227dcfe3878ffbda88ab1efdaacb475"; + sha256 = "1xkwjmzymbvbaiffp360670xk1cp1kascfmpkr3q5mnn4nlzm1zq"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -10894,12 +10894,12 @@ final: prev: render-markdown-nvim = buildVimPlugin { pname = "render-markdown.nvim"; - version = "2024-12-09"; + version = "2024-12-13"; src = fetchFromGitHub { owner = "MeanderingProgrammer"; repo = "render-markdown.nvim"; - rev = "3d2dc15542e56671dd14dfbfff63434ec21d8fcd"; - sha256 = "0f58r8p6va7ac8v67xxigpl8afhflqjwfpqf9g6q2rxr33qxnp2d"; + rev = "0022a579ac7355966be5ade77699b88c76b6a549"; + sha256 = "1yz61sbldqrnfj5wd2q77vz0hybl8x1h2zs9krkhp7p963d4a22f"; }; meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/"; }; @@ -10931,12 +10931,12 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2024-11-09"; + version = "2024-12-12"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "e82dc524894b1b55bcc3296d3644f15c9e06d5ad"; - sha256 = "1s8vid9d2dacx86f77vx7pdwidhfxyighblchxjybj4fn1b7qwj0"; + rev = "8b489547ddbe674712750b69b34436527d855500"; + sha256 = "1mx8nk2jvwabkj4gc9fiw6w69p407a7drv9scwalx4g9kgh6w493"; fetchSubmodules = true; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; @@ -11004,24 +11004,24 @@ final: prev: rose-pine = buildVimPlugin { pname = "rose-pine"; - version = "2024-10-23"; + version = "2024-12-10"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "07a887a7bef4aacea8c7caebaf8cbf808cdc7a8e"; - sha256 = "00gyn9s5c76fk1sqyg48aldbq2d8m33xia48vik8grj9wp12kbpx"; + rev = "91548dca53b36dbb9d36c10f114385f759731be1"; + sha256 = "00zhx2j5lm27pcfaimzbkil61gfc6cxyy1dcgc4cyb8vfi8psf3s"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; roslyn-nvim = buildVimPlugin { pname = "roslyn.nvim"; - version = "2024-12-13"; + version = "2024-12-18"; src = fetchFromGitHub { owner = "seblj"; repo = "roslyn.nvim"; - rev = "6d591af98e0fac1d382de15de88d26df53ec8b67"; - sha256 = "0v7x0a0xld34n3bklbxhqna0hcwpxph6l2pfq8h2v2dfswid0015"; + rev = "1bc4553c3484480f08ea2ced3cebb6bd98e169e7"; + sha256 = "1nxr5zp4l52f7c35wx5gw5bg8wghpzp1q29alprqkbhzdddw6ah4"; }; meta.homepage = "https://github.com/seblj/roslyn.nvim/"; }; @@ -11256,12 +11256,12 @@ final: prev: sg-nvim = buildVimPlugin { pname = "sg.nvim"; - version = "2024-09-17"; + version = "2024-12-15"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "76c97d91f8d8818a4fcf14817fadd98412aa44c8"; - sha256 = "sha256-MxFr59crdc9WlYwydM1dI1NU+5qB06xh+hFnNUuBc4c="; + rev = "7c423ebeb028b3534eb20fe54972825384dbe7d6"; + sha256 = "1d9ag1q9yxiai5hfm0x4am710gqzx3liw4qg10glskjczmgiic00"; }; meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; }; @@ -11317,12 +11317,12 @@ final: prev: slimv = buildVimPlugin { pname = "slimv"; - version = "2024-11-17"; + version = "2024-12-14"; src = fetchFromGitHub { owner = "kovisoft"; repo = "slimv"; - rev = "79f7ba2944498663e823b6675efc385732ca13b9"; - sha256 = "0ksxs4haiwfx6zd48y801mjn4v16xhy86yqrr4yyancprnjihqkl"; + rev = "a7a47151ae622f2971cbd7126e1400da27a04df5"; + sha256 = "0xk2x60y0p14jzpkx847w4m702mbk7cpa54ryr9ggsgivrcpqqwv"; }; meta.homepage = "https://github.com/kovisoft/slimv/"; }; @@ -11341,12 +11341,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2024-12-07"; + version = "2024-12-14"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "264e865589389409f1ac1da7673b1b732b1e8963"; - sha256 = "1d9qwx9367533vvx7ijnwbijk4ngf9r2q0wpxpra6zsn3l46ga22"; + rev = "1e8fa136f1be004c75b4f794f86a7103e077b6ca"; + sha256 = "0mzzsjndqf2hwsaq6gl51jyal436hqwr0b0iy8552cz672s0w95h"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -11389,12 +11389,12 @@ final: prev: snacks-nvim = buildVimPlugin { pname = "snacks.nvim"; - version = "2024-12-09"; + version = "2024-12-19"; src = fetchFromGitHub { owner = "folke"; repo = "snacks.nvim"; - rev = "fc71e36c90f44e0e6180ac6c5f035817709569d8"; - sha256 = "0w2hqz59qm8rnaacykl4fbby5j69a4pjynd0zcnrs59648pf769b"; + rev = "9563bb1ffc890abf35341561ea2362b9ac51da04"; + sha256 = "0wy1bwv9amdr5l23m7yzx95c3jxwdcdlanqljq9iz2dxyzwvqlhr"; }; meta.homepage = "https://github.com/folke/snacks.nvim/"; }; @@ -11413,12 +11413,12 @@ final: prev: snipe-nvim = buildVimPlugin { pname = "snipe.nvim"; - version = "2024-12-07"; + version = "2024-12-19"; src = fetchFromGitHub { owner = "leath-dub"; repo = "snipe.nvim"; - rev = "b9b4fd3c10341a3cf7895a024c3c378ca65295ac"; - sha256 = "1h4qrb1b7rjga1ng9i043fjw7zh1qv57qfz3ghp90gbxi7a0m9hw"; + rev = "9dc03ff9abf5c3939e1cc3f601b8285b6175b145"; + sha256 = "1n131lbxgfl6c0k5kjqpvp6mijspzq8ig7jn5165g6azzqk282pn"; }; meta.homepage = "https://github.com/leath-dub/snipe.nvim/"; }; @@ -11594,12 +11594,12 @@ final: prev: sqlite-lua = buildVimPlugin { pname = "sqlite.lua"; - version = "2024-04-21"; + version = "2024-12-19"; src = fetchFromGitHub { owner = "kkharji"; repo = "sqlite.lua"; - rev = "d0ffd703b56d090d213b497ed4eb840495f14a11"; - sha256 = "1nj0yqrr8dzjva14irp10g0c6xbnv3wm1igkl2cc7c8f3bddrfwx"; + rev = "cf482586c4f24e197375235a6e310b9b9e80ba83"; + sha256 = "0jljfarfkvfx6ik99lrkgr4ajrm595gkd8lm5885ca9mmyaysh0b"; }; meta.homepage = "https://github.com/kkharji/sqlite.lua/"; }; @@ -11907,12 +11907,12 @@ final: prev: tabby-nvim = buildVimPlugin { pname = "tabby.nvim"; - version = "2024-12-01"; + version = "2024-12-16"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "9705aeec0009f7c5abc573e69bce63682974c2bd"; - sha256 = "1x91933qlm29wdsirpiqmpci46jg6i97wzjvd9yh8kmskwzn4mcz"; + rev = "7b0b785491ce40cea0f7b99a428636d6a8fe920c"; + sha256 = "1738flbra74hcirn5v0zv5zbzs6z4gxfkf7n4c19ndrg4d2fk5xq"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; }; @@ -11968,12 +11968,12 @@ final: prev: tabout-nvim = buildVimPlugin { pname = "tabout.nvim"; - version = "2024-08-05"; + version = "2024-12-10"; src = fetchFromGitHub { owner = "abecodes"; repo = "tabout.nvim"; - rev = "923aea2613c9e7abf81e099d46086f62c7e54896"; - sha256 = "0d6v5xqx3bck6h17cbnkllyyfflwjjz24vzcijjz6733igh48q22"; + rev = "9a3499480a8e53dcaa665e2836f287e3b7764009"; + sha256 = "1mjnzrz2zh8kd95p12l70zmpw7nf5xnlr4pwss51s2cgy1wyfgz5"; }; meta.homepage = "https://github.com/abecodes/tabout.nvim/"; }; @@ -12185,12 +12185,12 @@ final: prev: telescope-fzf-native-nvim = buildVimPlugin { pname = "telescope-fzf-native.nvim"; - version = "2024-07-02"; + version = "2024-12-12"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b"; - sha256 = "0h741m7rcm5kl0mq9kkzw6za2h53chavpkai1qp433plaxzlyj0q"; + rev = "dae2eac9d91464448b584c7949a31df8faefec56"; + sha256 = "0gm67j7gcs2a02b7nj15l6acy3dxjqd8cy6mx8nfkdlmq2fij5k4"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; @@ -12270,12 +12270,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2024-12-08"; + version = "2024-12-15"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "a69e28d0690a3e41721b52160be75a4bbf7f7331"; - sha256 = "1r2cvwbjb1dgcglcdqmbld4m8rxry168in94ldhhhc0lvr2a6vml"; + rev = "a95629196f44794391539bbf0ed7051235f500e3"; + sha256 = "0c4bf93dqgsl7vm6bvjrqvrrllw0ccfn7mygyw2d64vvhy029rb0"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -12643,12 +12643,12 @@ final: prev: tiny-inline-diagnostic-nvim = buildVimPlugin { pname = "tiny-inline-diagnostic.nvim"; - version = "2024-12-08"; + version = "2024-12-18"; src = fetchFromGitHub { owner = "rachartier"; repo = "tiny-inline-diagnostic.nvim"; - rev = "5de2eea9c99e7905a813f649c430fc2a70243b9d"; - sha256 = "10cb3d2lpwg5dw5n8442mhmhxpxjjw8013h7v08039ghmag9bvbh"; + rev = "66d9166520a0cb3392a5ef68946fd3980d57383f"; + sha256 = "09d7fdvdj8r4yg10288fkj2749qmhkvppvf9l05jcq9psv57k938"; }; meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/"; }; @@ -12752,12 +12752,12 @@ final: prev: tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2024-12-07"; + version = "2024-12-14"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "355e2842291dbf51b2c5878e9e37281bbef09783"; - sha256 = "18684yf56vkli162m9hs0j197hwiignw0jsmr8lhsh9svnai2bv2"; + rev = "45d22cf0e1b93476d3b6d362d720412b3d34465c"; + sha256 = "1038ff6i8csxx3cqccgbpv06slvbcs534cfkq7s58ww2vvldm7sc"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -12800,12 +12800,12 @@ final: prev: treesj = buildVimPlugin { pname = "treesj"; - version = "2024-11-23"; + version = "2024-12-12"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "03415ac60791d48e120a80d37e080744faf3ac15"; - sha256 = "005hdv4c1bi1qdbdfsc0qmwbnf98mgi28rkhvqxyf37rq0v1cmai"; + rev = "94f6df623f2d15630b1b617abff39962024cb501"; + sha256 = "1yc9mnck0mhj8w1p37sfh8p8gdb0mnn82q44804prxmzgrjgh9jj"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -12885,24 +12885,24 @@ final: prev: ts-comments-nvim = buildVimPlugin { pname = "ts-comments.nvim"; - version = "2024-10-22"; + version = "2024-12-14"; src = fetchFromGitHub { owner = "folke"; repo = "ts-comments.nvim"; - rev = "2002692ad1d3f6518d016550c20c2a890f0cbf0e"; - sha256 = "1fwscqdqcza46zhbm76bfhfmz5x92cpl1hl5myfm8zkqax9kxk3l"; + rev = "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74"; + sha256 = "1jnxhj25x9mzm2m8sqgp8viwd8kswyrc1k4s4yqxh457m8xj6yn1"; }; meta.homepage = "https://github.com/folke/ts-comments.nvim/"; }; tsc-nvim = buildVimPlugin { pname = "tsc.nvim"; - version = "2024-08-14"; + version = "2024-12-11"; src = fetchFromGitHub { owner = "dmmulroy"; repo = "tsc.nvim"; - rev = "82c37ebfe45d30763db6f45b54e18f1e485bb52c"; - sha256 = "14fa5w73bxpvwy3jm25mmx08l2v6c1w35ca8gc61mayxja55d4ls"; + rev = "59abb6f3f24a3ca80708f694af4e2b727a1a3211"; + sha256 = "1s47l4m741d7z9diicqn48b5avk1n3sxx64f8xjr6l0rn9518zsz"; }; meta.homepage = "https://github.com/dmmulroy/tsc.nvim/"; }; @@ -13005,12 +13005,12 @@ final: prev: typst-preview-nvim = buildVimPlugin { pname = "typst-preview.nvim"; - version = "2024-12-02"; + version = "2024-12-16"; src = fetchFromGitHub { owner = "chomosuke"; repo = "typst-preview.nvim"; - rev = "0cb5f5627312f50ce089f785ec42b55a85f30ce7"; - sha256 = "0z1d8jn88abxqlrb03cl763s73ybybdq1hiva0vj52ldygc1k0xr"; + rev = "23db1bd5a32ff0b346817ed72e615c6419b11f48"; + sha256 = "1jljmbza7gdmskizg9b58isy7m755kxalrwvcb0d0xq0m3j48ddr"; }; meta.homepage = "https://github.com/chomosuke/typst-preview.nvim/"; }; @@ -13089,12 +13089,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2024-12-04"; + version = "2024-12-19"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "cece28919858decae868f5ab0ed10f3649ef26a5"; - sha256 = "01zmac97r2ygpa9wswbql3zlvakh0c9prcz4j1v34av8z9spsl1g"; + rev = "a2d3c2ca1f5e17af45feaf463ee986181ecda390"; + sha256 = "02z6yfa31kvl8q9apkjwvxyfapn3r19gbfv9rimckciga2gvi4zf"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -13197,12 +13197,12 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2024-12-04"; + version = "2024-12-18"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "bbf0ae9323a6bf67519e9381cf15f574c4414b86"; - sha256 = "00y8j9am25blhwwl8swh03svvf3s9950078qg52h9l9rlsijd7rd"; + rev = "69fe7ec76aab14049c15e4819d358d496d4c18e9"; + sha256 = "0f0w5v2v3sndh5z8q4ccqcrrd1sfhr0rdqfir8z6r31y09wq715y"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -14277,36 +14277,36 @@ final: prev: vim-dadbod = buildVimPlugin { pname = "vim-dadbod"; - version = "2024-10-18"; + version = "2024-12-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "fe5a55e92b2dded7c404006147ef97fb073d8b1b"; - sha256 = "1qy9pm7rwpzk8a5f2a1bqa6fgnkl4y06rqwsrkd3p3396kl1s6f1"; + rev = "f740950d0703099e0f172016f10e0e39f50fd0ba"; + sha256 = "13kwx67r5xl22znrd3i48qvr5dl5ny7qkpwkp455grkdx9y4q2gg"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; vim-dadbod-completion = buildVimPlugin { pname = "vim-dadbod-completion"; - version = "2024-12-02"; + version = "2024-12-19"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "04485bfb53a629423233a4178d71cd4f8abf7406"; - sha256 = "1cbny9swh6m4f68f0inw5srml7144f6m14n5rzidy4m3284c9jdx"; + rev = "9e354e86fcc67a5ec2c104f312e374ea2f89c799"; + sha256 = "0samdn88rlnhcza7sab3nh9pjlcgw6mq0iv3w8whn0l7fsrg3y77"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; vim-dadbod-ui = buildVimPlugin { pname = "vim-dadbod-ui"; - version = "2024-12-01"; + version = "2024-12-12"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "7f89265a84fc003ccfa500fd99b9fea9db2c75c7"; - sha256 = "1z0ppjjqvw19daa7ssfynpq55p0qvb9p76b76qk4ph3g9nj6qdqn"; + rev = "0fec59e3e1e619e302198cd491b7d27f8d398b7c"; + sha256 = "1gf03lg5lp34rjpkvbni5jzkxbcq50ckx8gim9ja7gpw1mf8siq6"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -14589,12 +14589,12 @@ final: prev: vim-endwise = buildVimPlugin { pname = "vim-endwise"; - version = "2024-10-13"; + version = "2024-12-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-endwise"; - rev = "1d42c830d8a81958a6703cee8f4caece4b1b8423"; - sha256 = "1bg42ks9i60g255s3di11asqsywhdm1ag7k9nn16m6nghvbdrflz"; + rev = "5ec72eef1a07fb32af9be5402144678f68cb1a7a"; + sha256 = "09wbf132vd7jsyv6i59nlq99dk2723mqkisfgvfv1m0xr14rr8gw"; }; meta.homepage = "https://github.com/tpope/vim-endwise/"; }; @@ -14661,12 +14661,12 @@ final: prev: vim-eunuch = buildVimPlugin { pname = "vim-eunuch"; - version = "2024-10-13"; + version = "2024-12-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-eunuch"; - rev = "6c6af39aa0a25223389607338ae965c5dfc7c972"; - sha256 = "01qgpn9z6izv8ik7qhdmki3zwaackn62aan7qp11k9i2mzd5fx39"; + rev = "c61533c9868ce78bb7fcbe06b308d7fa7f19e447"; + sha256 = "0nnckik4shkmymym17jsfyiplfxhf3hi1anwx7wlc8rh3px0xv4x"; }; meta.homepage = "https://github.com/tpope/vim-eunuch/"; }; @@ -14865,12 +14865,12 @@ final: prev: vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; - version = "2024-11-19"; + version = "2024-12-15"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "320b18fba2a4f2fe3c8225c778c687e0d2620384"; - sha256 = "1whwsz6sispx59pcqxv64890rb4gga35nd758kcm7f27md7vcr24"; + rev = "fcb4db52e7f65b95705aa58f0f2df1312c1f2df2"; + sha256 = "1iyb3qxyf0x26q7ndx1ycq1ankqwr0bw6qghv8kw1mnr5c9b15rw"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -15659,12 +15659,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2024-11-21"; + version = "2024-12-16"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "fbe69d1723230e14f245ca34b0c98fa916b36f64"; - sha256 = "0j1r94v3grd1s4drg18r5ajnwvm4danyrzbaj90xb712bakcjyiw"; + rev = "ed67f198e981f555c0f9e9ed5b69b4b06543a9e1"; + sha256 = "03zbh0my0l966y46l21612m5gr8c57jhhnhxxyzlrpy2wh59xjmk"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -15923,12 +15923,12 @@ final: prev: vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2024-11-29"; + version = "2024-12-16"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "9cf5846335321df5742b04d573979a3a52478a12"; - sha256 = "18mxk0bn1x6p6lpab06z5ps2qdh2smwa1xsj3g1357l016ar4qlg"; + rev = "496fbb2f910aecd3bb481d70c39806ff266a0d06"; + sha256 = "1bw0ikn3vfg32bri9561qnbfhvfgf1sycrn7h15j8sp9wax9ydm0"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; }; @@ -16056,12 +16056,12 @@ final: prev: vim-matchup = buildVimPlugin { pname = "vim-matchup"; - version = "2024-10-28"; + version = "2024-12-18"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "5fb083de1e06fdd134c6ad8d007d4b5576b25ba7"; - sha256 = "1913gqqhza5nhcmxh0bdrn0bzsizk6ymlrv303dd5s1mp8k44mzn"; + rev = "aca23ce53ebfe34e02c4fe07e29e9133a2026481"; + sha256 = "1ishy555bs2r3sr7bjrr70hc25ms5iyq76660y2vhyjrndqfranx"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -16140,12 +16140,12 @@ final: prev: vim-monokai = buildVimPlugin { pname = "vim-monokai"; - version = "2024-11-28"; + version = "2024-12-10"; src = fetchFromGitHub { owner = "crusoexia"; repo = "vim-monokai"; - rev = "1c46309037c9e07dfb83531654bc61290c6be114"; - sha256 = "0w5bk3q0dfi2m8mif64jg6vvmr21cq1n329j8wxr2qj2r0piz3bs"; + rev = "54a2a6c2f4c0d20401af98952945945f6b94101f"; + sha256 = "1fx0548mdq0rqmw71bpsvd6bs7gn18zhn1yv5kbh3h8h93a8sl8y"; }; meta.homepage = "https://github.com/crusoexia/vim-monokai/"; }; @@ -17040,12 +17040,12 @@ final: prev: vim-ruby = buildVimPlugin { pname = "vim-ruby"; - version = "2023-10-25"; + version = "2024-12-12"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "f06f069ce67bdda6f2cd408f8859cdf031e5b6b4"; - sha256 = "08jkb840z1li8vbrbvigxffl5d84bl61cnm8xb2k59ic3l7ia96g"; + rev = "dcf0d9f0f0ab385f313d8cea58dc6d03f22cf072"; + sha256 = "00jhjyzs1m79s9y7azgrpahy678m5wzjwrfrnrslgxjd1spa9ar1"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; @@ -17268,12 +17268,12 @@ final: prev: vim-slime = buildVimPlugin { pname = "vim-slime"; - version = "2024-10-06"; + version = "2024-12-18"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "c8cfb9bec587aef0a7a87a52dacb087f48ea2b41"; - sha256 = "1wvc2342y0m7q8bqqqc5g4ls9jldi6dni9vp4szzj9sxp8ss4dgg"; + rev = "5280fdf24888b1e31409198f284ad2d3a88c692e"; + sha256 = "1qns7hmvwn9w7hpbzy8hj09gfwik7bl1p55gn1hjq1yila6yn799"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -17677,12 +17677,12 @@ final: prev: vim-test = buildVimPlugin { pname = "vim-test"; - version = "2024-11-19"; + version = "2024-12-17"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "8872ec0f788af934386b2aef0cd28a5c2b923146"; - sha256 = "1n8s1sjh52hqh6qm72pyf6krhcdlsrr288ybcxf3r43m486jcnfm"; + rev = "5de3bfff03a36d88608d94dba69266f3a48238f2"; + sha256 = "011dn8k5gp6mp00n9p9a5gcyh44ln2848hj8n73vgml5rzglkblh"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -18313,12 +18313,12 @@ final: prev: vimade = buildVimPlugin { pname = "vimade"; - version = "2024-12-08"; + version = "2024-12-18"; src = fetchFromGitHub { owner = "TaDaa"; repo = "vimade"; - rev = "a2bab7410522f803c0315235f86a9389a729e898"; - sha256 = "0xclg2np692cyyjvp4g9yvsxc82l1rmi1andimn2prlh2dli5zvj"; + rev = "b258553e04212cb692a10894b220588daff21222"; + sha256 = "07k61j54vazvw9087zx9a6zx0scvk4283rfwz2msjfqchqp2mgik"; }; meta.homepage = "https://github.com/TaDaa/vimade/"; }; @@ -18421,12 +18421,12 @@ final: prev: vimspector = buildVimPlugin { pname = "vimspector"; - version = "2024-12-06"; + version = "2024-12-12"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "696c52a6af7a725e9b07a9db646135297a9c29d0"; - sha256 = "054ybly3s0yfn6454xgf16wc6dcb728180khi5jcipxfvizgf21l"; + rev = "3a86a1bc5c1af1a40e16768e3ae4e44584cc88b8"; + sha256 = "02jr5l2a6z5cy8jy2q1kjsrgrrd57dxgilrzglh1mr1lfvvdq1xw"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -18434,12 +18434,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2024-12-08"; + version = "2024-12-14"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "de42a9a5e4e24253201256953133efdf488906ae"; - sha256 = "1fiadadcyyvb52bzp1vicfwy51gry0ifh3bmqw7ifp56rw1aaj25"; + rev = "b8bb79b5fb27e9030ade92e75cd9375416f2c666"; + sha256 = "0xfflns91x5yigbkybd8phj5hbs0i6fry3ll2mp6r6azcgzcppjg"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -18518,12 +18518,12 @@ final: prev: vista-vim = buildVimPlugin { pname = "vista.vim"; - version = "2024-06-11"; + version = "2024-12-11"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "c07585b588071adc8e9670becadb89307153e4d1"; - sha256 = "0gpa38jn41pa550l30kvb5wb04bac45sl4dxbwhqhnay42wc90fk"; + rev = "1e90efad6e32c4f7d16b1ca8f49bf63d0693802e"; + sha256 = "1gbldkajy50x70p0m5wnbd3wvpzb4b79wmgdq8m85iyf5h1phkzf"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -18590,12 +18590,12 @@ final: prev: which-key-nvim = buildVimPlugin { pname = "which-key.nvim"; - version = "2024-11-28"; + version = "2024-12-15"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "9b365a6428a9633e3eeb34dbef1b791511c54f70"; - sha256 = "1r9zq4p8hm3pk2m65m4qczrls6g4bp0j17lfyyyd3b3lsdnnd577"; + rev = "8ab96b38a2530eacba5be717f52e04601eb59326"; + sha256 = "12wkl04apgag0p5njw8mczzlbxqf5h08k61qciwy10n4q1harzvz"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -18626,12 +18626,12 @@ final: prev: wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "2024-12-08"; + version = "2024-12-18"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "969aecfd794f643960a4c83e195454b9d6f92159"; - sha256 = "13fqiag08s78p19z90npi4vfxmpb471k2im53frnzgsb8pl18w2a"; + rev = "8cc3f584cc20424f776fb60932c6ac265f526e6a"; + sha256 = "0a7669dx8fq1nccgw8vrk5q8i9qzhk5g9by6zsvl16gr1jg8lza5"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; @@ -18819,12 +18819,12 @@ final: prev: yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "2024-12-08"; + version = "2024-12-17"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - rev = "a084a008c1479b9e50259995fe0192714d641c44"; - sha256 = "0gfhyl67hllavmkyii9anjk9f80f3kvf079gm2hkkalcgj40ax55"; + rev = "2d6e9b9e2bda2294a978f60367598b75ea5b59d0"; + sha256 = "10ry4r7w6xfr8f6b8z6x05gas04d4b7v51i1gd9js0bd6vny3kx8"; }; meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; }; @@ -18903,24 +18903,24 @@ final: prev: zen-mode-nvim = buildVimPlugin { pname = "zen-mode.nvim"; - version = "2024-07-22"; + version = "2024-12-11"; src = fetchFromGitHub { owner = "folke"; repo = "zen-mode.nvim"; - rev = "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6"; - sha256 = "0cbdj5wwx582yqlpjdfg1snxxx3z2wn6v2gzvyling5ma6faqwc8"; + rev = "863f150ca321b3dd8aa1a2b69b5f411a220e144f"; + sha256 = "1yfvlf6fdir7bs9avfvda5f5mc1d53fsy2xaspzpsb3yivbd11sf"; }; meta.homepage = "https://github.com/folke/zen-mode.nvim/"; }; zenbones-nvim = buildVimPlugin { pname = "zenbones.nvim"; - version = "2024-10-03"; + version = "2024-12-10"; src = fetchFromGitHub { owner = "zenbones-theme"; repo = "zenbones.nvim"; - rev = "88960c8aa3ad8aff0bcccdce7cd23629c7a3c510"; - sha256 = "0wkd8gq778xyixlq9yr2khs0sm9m8hfwzmy37ybqlr1a8i0fv74r"; + rev = "3c0b86bb912d41d191d90c019a346f6a1d27f588"; + sha256 = "16pxygjnch6qi2zfg6ixq0w8c6yx48bk5kxsznkz8zs1i2zvgh5p"; }; meta.homepage = "https://github.com/zenbones-theme/zenbones.nvim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 14f4196802475..6d9027d230d98 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2655,7 +2655,7 @@ in pname = "sg-nvim-rust"; inherit (old) version src; - cargoHash = "sha256-7Bo0DSRqxA7kgNuyuWw24r3PsP92y9h98SHFtIhG+Gs="; + cargoHash = "sha256-/eY4LD488QZHkKvyc3m9vD96gHhZ1961bp9L56xYq9o="; nativeBuildInputs = [ pkg-config ]; From eab1ab601578b4c2ce2d2cfbc4712b4d56f27f1a Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 19 Dec 2024 20:32:59 -0600 Subject: [PATCH 141/146] vimPlugins: resolve github repository redirects --- pkgs/applications/editors/vim/plugins/vim-plugin-names | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index d7b1816005105..bbb908876dad0 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -727,7 +727,7 @@ https://github.com/terrortylor/nvim-comment/,, https://github.com/roxma/nvim-completion-manager/,, https://github.com/klen/nvim-config-local/,, https://github.com/andythigpen/nvim-coverage/,HEAD, -https://github.com/yamatsum/nvim-cursorline/,, +https://github.com/ya2s/nvim-cursorline/,, https://github.com/mfussenegger/nvim-dap/,, https://github.com/leoluz/nvim-dap-go/,HEAD, https://github.com/julianolf/nvim-dap-lldb/,HEAD, @@ -771,7 +771,7 @@ https://github.com/SmiteshP/nvim-navbuddy/,, https://github.com/smiteshp/nvim-navic/,HEAD, https://github.com/AckslD/nvim-neoclip.lua/,, https://github.com/nvim-neotest/nvim-nio/,HEAD, -https://github.com/yamatsum/nvim-nonicons/,, +https://github.com/ya2s/nvim-nonicons/,, https://github.com/rcarriga/nvim-notify/,, https://github.com/LhKipp/nvim-nu/,HEAD, https://github.com/ojroques/nvim-osc52/,, From 6c0016d2e61ab736d488796a7e7c4a60ab13034e Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 19 Dec 2024 20:33:00 -0600 Subject: [PATCH 142/146] vimPlugins.nvim-treesitter: update grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 198 +++++++++--------- 1 file changed, 99 insertions(+), 99 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index c0982570788ff..1532cc4a66efb 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -38,12 +38,12 @@ }; apex = buildGrammar { language = "apex"; - version = "0.0.0+rev=f5a1d21"; + version = "0.0.0+rev=bb2faa9"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "f5a1d2188ff711a06c6a8daa65bbf2f17c8378a5"; - hash = "sha256-iNoMqyZmS3CoazDQv9/hJb1CRXojEM4IyE5ReqHV4k8="; + rev = "bb2faa992f6915079c2731632fba74874b85d188"; + hash = "sha256-WCjuDebUQu5rW+PEM3KpLWRTbfQVl8bfFMcj2TS8Tyw="; }; location = "apex"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -193,12 +193,12 @@ }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=e8841a6"; + version = "0.0.0+rev=3efee11"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "e8841a6a9431b7365ac9055688429e1deb8db90f"; - hash = "sha256-fFrIqiOgW+Aq4SbmevjLwooYeDOh0Odp0OJ/LkGDS04="; + rev = "3efee11f784605d44623d7dadd6cd12a0f73ea92"; + hash = "sha256-nb+CoRbX7RFAGus7USWA1NhAnnkkJ89vIdSN36QmSCE="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; @@ -559,12 +559,12 @@ }; editorconfig = buildGrammar { language = "editorconfig"; - version = "0.0.0+rev=3288aa4"; + version = "0.0.0+rev=efcd7c2"; src = fetchFromGitHub { owner = "ValdezFOmar"; repo = "tree-sitter-editorconfig"; - rev = "3288aa46e30e1295133bd6f303c00ac71b4f61ad"; - hash = "sha256-hVCp4cRgc3ALVbpRAd8wYTZ77wZMDAQGmGddt0QuOFY="; + rev = "efcd7c2852c69822d625786324538b7457fafddb"; + hash = "sha256-/JJKr4wZc9aGs8VFH479hazUDGD7kt3rw8LpH4w2GX8="; }; meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig"; }; @@ -592,23 +592,23 @@ }; elixir = buildGrammar { language = "elixir"; - version = "0.0.0+rev=d301895"; + version = "0.0.0+rev=02a6f7f"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "tree-sitter-elixir"; - rev = "d30189581a8b2802f237884287fdb7c40f32a041"; - hash = "sha256-xaQ9NZUt0eE7IB1SmhBZqMM8KluI5mid//jJNsLuS4M="; + rev = "02a6f7fd4be28dd94ee4dd2ca19cb777053ea74e"; + hash = "sha256-OM2RWQNdYMltYwmbU5f4ZK5a8Wx4JxBMYx9R5n2B4jg="; }; meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir"; }; elm = buildGrammar { language = "elm"; - version = "0.0.0+rev=27f502e"; + version = "0.0.0+rev=e34bdc5"; src = fetchFromGitHub { owner = "elm-tooling"; repo = "tree-sitter-elm"; - rev = "27f502ed0a1cbd3c5912d284cc7934ee0d4cdddc"; - hash = "sha256-o5ou/9/TCzc9HuGzvSSZE2iyWCOwYk0c28KEgGrOiiI="; + rev = "e34bdc5c512918628b05b48e633f711123204e45"; + hash = "sha256-LKXYQk7W/2KUvHGM7DV041IdR7IbpnaaTf3fxIzAlxo="; }; meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm"; }; @@ -746,12 +746,12 @@ }; fortran = buildGrammar { language = "fortran"; - version = "0.0.0+rev=6f16bab"; + version = "0.0.0+rev=c979a86"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "6f16bab7455cd2906a86679a1be83dd4f378db81"; - hash = "sha256-WsAKQ1R9wDjgrC/5t3RRZFSszehtgxY3uHtv9JKrgV4="; + rev = "c979a86414d3c5bfabee72356bb22bd5f87d0942"; + hash = "sha256-BdU5gRLxZMzX6nzB0D8E9vksmdJDtvuCGXX6mJGczPA="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -1077,12 +1077,12 @@ }; gren = buildGrammar { language = "gren"; - version = "0.0.0+rev=df7992d"; + version = "0.0.0+rev=76554f4"; src = fetchFromGitHub { owner = "MaeBrooks"; repo = "tree-sitter-gren"; - rev = "df7992dbc1e57e055ba1cbfdbe9f961750940553"; - hash = "sha256-MoY9gPPy0FX7eThxDrAowaEL5nWlZVC6Y6LObPczNN0="; + rev = "76554f4f2339f5a24eed19c58f2079b51c694152"; + hash = "sha256-42NfFE/QQi1LacquvGHaR3tGVeaU2n/q7tMhwV5+w4E="; }; meta.homepage = "https://github.com/MaeBrooks/tree-sitter-gren"; }; @@ -1232,12 +1232,12 @@ }; hoon = buildGrammar { language = "hoon"; - version = "0.0.0+rev=2ac017d"; + version = "0.0.0+rev=1545137"; src = fetchFromGitHub { owner = "urbit-pilled"; repo = "tree-sitter-hoon"; - rev = "2ac017d168aca1e75b3df94dbbb6b3083f79cdfe"; - hash = "sha256-fRaEZGpZWiwhClYZnkkCC8rIamR38PhesY5LY6GFozQ="; + rev = "1545137aadcc63660c47db9ad98d02fa602655d0"; + hash = "sha256-RkSPoscrinmuSTWHzXkRNaiqECDXpKAbQ4z7a6Tpvek="; }; meta.homepage = "https://github.com/urbit-pilled/tree-sitter-hoon"; }; @@ -1265,12 +1265,12 @@ }; http = buildGrammar { language = "http"; - version = "0.0.0+rev=231f1b1"; + version = "0.0.0+rev=d2e4e4c"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "tree-sitter-http"; - rev = "231f1b1bafd12e46c8ed8c21dbbdd940d9f15e94"; - hash = "sha256-q8g7u3ctpfl0vq+RVBw7g7js/4SwAIkHg4CCRCuQ28w="; + rev = "d2e4e4c7d03f70e0465d436f2b5f67497cd544ca"; + hash = "sha256-QpclMUSVHtYwbzxb5MG0WSIcMKLkdBNbVXdBlbdnXvI="; }; meta.homepage = "https://github.com/rest-nvim/tree-sitter-http"; }; @@ -1485,12 +1485,12 @@ }; kotlin = buildGrammar { language = "kotlin"; - version = "0.0.0+rev=76f53c4"; + version = "0.0.0+rev=0662afb"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "76f53c48d29e8588934fb55b0240d7bdfe00bfe5"; - hash = "sha256-EBySJmzXH0FoWcslHNs70N9e9K9O/4/RcpbcdWYmgI4="; + rev = "0662afbd2ce19b17c603acf67ae707b4d69ab8f4"; + hash = "sha256-r3emNyglirgxb1ktR46EgsECv6ueHUpo6wI2ULyUBtU="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; @@ -1585,12 +1585,12 @@ }; liquidsoap = buildGrammar { language = "liquidsoap"; - version = "0.0.0+rev=14feafa"; + version = "0.0.0+rev=8e51fa6"; src = fetchFromGitHub { owner = "savonet"; repo = "tree-sitter-liquidsoap"; - rev = "14feafa91630afb1ab9988cf9b738b7ea29f3f89"; - hash = "sha256-FERYGF9D163b6S/YBwHwkrUM2qRkEKOViSDRa61OjtQ="; + rev = "8e51fa63ddb93ac179d4e34a311d3d3f03780b42"; + hash = "sha256-i6cQoMeKOS2hEId9bpqNchQDh2vjAfKk+hLTEMOUegU="; }; meta.homepage = "https://github.com/savonet/tree-sitter-liquidsoap"; }; @@ -1673,24 +1673,24 @@ }; markdown = buildGrammar { language = "markdown"; - version = "0.0.0+rev=c89a30c"; + version = "0.0.0+rev=192407a"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "c89a30ce556a5ea5552e816e5dc2f2c0de96237d"; - hash = "sha256-v1M6CBOjBwtxkO2k1hksQS4ZkdFNcoXmu1nc7X8OKG0="; + rev = "192407ab5a24bfc24f13332979b5e7967518754a"; + hash = "sha256-R5y1kMVXzzl/pX6FUcLc1n6Z8eG+npMRwdJMoWtHs/U="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "0.0.0+rev=c89a30c"; + version = "0.0.0+rev=192407a"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "c89a30ce556a5ea5552e816e5dc2f2c0de96237d"; - hash = "sha256-v1M6CBOjBwtxkO2k1hksQS4ZkdFNcoXmu1nc7X8OKG0="; + rev = "192407ab5a24bfc24f13332979b5e7967518754a"; + hash = "sha256-R5y1kMVXzzl/pX6FUcLc1n6Z8eG+npMRwdJMoWtHs/U="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; @@ -1863,23 +1863,23 @@ }; nu = buildGrammar { language = "nu"; - version = "0.0.0+rev=a94fdf1"; + version = "0.0.0+rev=dc22e25"; src = fetchFromGitHub { owner = "nushell"; repo = "tree-sitter-nu"; - rev = "a94fdf1df5deba1aa1a3fff23e1276333b5ab666"; - hash = "sha256-5hZRTL7lKDHiwtxn+xhQpsLTrXZoFGc2wjCPtjZApjk="; + rev = "dc22e2577eb09d1d0de50802c59da2eca98a0e7b"; + hash = "sha256-9/8UnbbjI/65+CnIzJGfEl1Scltz3KUHh3/6Gb5kbwY="; }; meta.homepage = "https://github.com/nushell/tree-sitter-nu"; }; objc = buildGrammar { language = "objc"; - version = "0.0.0+rev=62e61b6"; + version = "0.0.0+rev=18802ac"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-objc"; - rev = "62e61b6f5c0289c376d61a8c91faf6435cde9012"; - hash = "sha256-Q1qAUgoYfpxmhn5XpnCwLBdu2BL2YF2We9bjumR8dNk="; + rev = "18802acf31d0b5c1c1d50bdbc9eb0e1636cab9ed"; + hash = "sha256-aK8Cf8F05NzlXnYS47jPjSyouaajsr1H+vRg2aXsPrs="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-objc"; }; @@ -2066,12 +2066,12 @@ }; poe_filter = buildGrammar { language = "poe_filter"; - version = "0.0.0+rev=908ba6a"; + version = "0.0.0+rev=2902dc4"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-poe-filter"; - rev = "908ba6accbd9cd3fdf0a208fdc186b9ca3db123c"; - hash = "sha256-WeDnIGTr3H5kqgGcMe9zEXdErg1FETNWuY0Pf4G3gAY="; + rev = "2902dc45439125b9386812c1089a8e9b5f71c4ab"; + hash = "sha256-j/634pLyfgF7Pyjmh4ETuW0U38kH6Seik1w4pJKBmec="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-poe-filter"; }; @@ -2088,12 +2088,12 @@ }; powershell = buildGrammar { language = "powershell"; - version = "0.0.0+rev=7e6ccf1"; + version = "0.0.0+rev=ff0ac42"; src = fetchFromGitHub { owner = "airbus-cert"; repo = "tree-sitter-powershell"; - rev = "7e6ccf19774a098bb3c996690c65cc1a6f439dc0"; - hash = "sha256-VL7wQc27n7IK+mU6zmbmAKcA37bku1Z5jHxonni6aAE="; + rev = "ff0ac42e742f3c4be3b55fd14f910d5dc204e323"; + hash = "sha256-GgPpMK/Gs3a4pVH61nlCtV2zKlPlgB7vNsUwPWkoCMk="; }; meta.homepage = "https://github.com/airbus-cert/tree-sitter-powershell"; }; @@ -2454,12 +2454,12 @@ }; roc = buildGrammar { language = "roc"; - version = "0.0.0+rev=ef46edd"; + version = "0.0.0+rev=7d29fc2"; src = fetchFromGitHub { owner = "faldor20"; repo = "tree-sitter-roc"; - rev = "ef46edd0c03ea30a22f7e92bc68628fb7231dc8a"; - hash = "sha256-H76cnMlBT1Z/9WXAdoVslImkyy38uCqum9qEnH+Ics8="; + rev = "7d29fc24b36119494b4dc3f3d967075e261706c1"; + hash = "sha256-v+yZ7ZIX83QWBqCVTjNmXv3bhtOjB3PY3SXLnt6l+Cw="; }; meta.homepage = "https://github.com/faldor20/tree-sitter-roc"; }; @@ -2509,23 +2509,23 @@ }; rust = buildGrammar { language = "rust"; - version = "0.0.0+rev=cad8a20"; + version = "0.0.0+rev=1f63b33"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "cad8a206f2e4194676b9699f26f6560d07130d3f"; - hash = "sha256-aT+tlrEKMgWqTEq/NHh8Vj92h6i1aU6uPikDyaP2vfc="; + rev = "1f63b33efee17e833e0ea29266dd3d713e27e321"; + hash = "sha256-HV7zMwO3ZMaHqX5cV43iwuC+QM7ecApZ2U/hbXuM34c="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=5f44942"; + version = "0.0.0+rev=fb999c7"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "5f44942205c2364ce2ced14a40687d1e09685034"; - hash = "sha256-qe2ozmVxjeTIZyhnDegJj9nBccD4mpevVcF5wIsJSbI="; + rev = "fb999c77139f6bd972f014b728e2f0bd32b4d602"; + hash = "sha256-GHx8tB36EypFqLk2qaFp9pTj/48SKZSRfCb8A5JodqM="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -2565,12 +2565,12 @@ }; sflog = buildGrammar { language = "sflog"; - version = "0.0.0+rev=f5a1d21"; + version = "0.0.0+rev=bb2faa9"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "f5a1d2188ff711a06c6a8daa65bbf2f17c8378a5"; - hash = "sha256-iNoMqyZmS3CoazDQv9/hJb1CRXojEM4IyE5ReqHV4k8="; + rev = "bb2faa992f6915079c2731632fba74874b85d188"; + hash = "sha256-WCjuDebUQu5rW+PEM3KpLWRTbfQVl8bfFMcj2TS8Tyw="; }; location = "sflog"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -2588,12 +2588,12 @@ }; slint = buildGrammar { language = "slint"; - version = "0.0.0+rev=4e2765d"; + version = "0.0.0+rev=f11da7e"; src = fetchFromGitHub { owner = "slint-ui"; repo = "tree-sitter-slint"; - rev = "4e2765d4cac1f03ada6f635eeb6008d1d0aff5a3"; - hash = "sha256-cEitYvrK9P5McbqQAH/PmbD5W0pYULwj3eP9lKXSOTE="; + rev = "f11da7e62051ba8b9d4faa299c26de8aeedfc1cd"; + hash = "sha256-NTxJwVYq3o+9+BbBi4Lcj++mB4hvKAN3N+dRadXuBNo="; }; meta.homepage = "https://github.com/slint-ui/tree-sitter-slint"; }; @@ -2621,46 +2621,46 @@ }; snakemake = buildGrammar { language = "snakemake"; - version = "0.0.0+rev=e909815"; + version = "0.0.0+rev=29a82dd"; src = fetchFromGitHub { owner = "osthomas"; repo = "tree-sitter-snakemake"; - rev = "e909815acdbe37e69440261ebb1091ed52e1dec6"; - hash = "sha256-d2n1fsdt4+1hv4In+o6GpGyfeyVHpn39Njm7tQ2zyYQ="; + rev = "29a82ddde86c0d428acf971b04794c13525c4bc5"; + hash = "sha256-55nfPYR9iuHpV1TXELOAyF+PVqI1LYpCGc9RP2RylVU="; }; meta.homepage = "https://github.com/osthomas/tree-sitter-snakemake"; }; solidity = buildGrammar { language = "solidity"; - version = "0.0.0+rev=bf26872"; + version = "0.0.0+rev=f7f5251"; src = fetchFromGitHub { owner = "JoranHonig"; repo = "tree-sitter-solidity"; - rev = "bf268722bc6406429776f71f012e6d1a88801931"; - hash = "sha256-mpKLES5tHhQFMldjOYLzh7a29DbtImENwM2+y0wJ3hk="; + rev = "f7f5251a3f5b1d04f0799b3571b12918af177fc8"; + hash = "sha256-Tt8lXaHrRFbbATUoWK+Y9FZohY1IeDTCXaaom4yZYb4="; }; meta.homepage = "https://github.com/JoranHonig/tree-sitter-solidity"; }; soql = buildGrammar { language = "soql"; - version = "0.0.0+rev=f5a1d21"; + version = "0.0.0+rev=bb2faa9"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "f5a1d2188ff711a06c6a8daa65bbf2f17c8378a5"; - hash = "sha256-iNoMqyZmS3CoazDQv9/hJb1CRXojEM4IyE5ReqHV4k8="; + rev = "bb2faa992f6915079c2731632fba74874b85d188"; + hash = "sha256-WCjuDebUQu5rW+PEM3KpLWRTbfQVl8bfFMcj2TS8Tyw="; }; location = "soql"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; sosl = buildGrammar { language = "sosl"; - version = "0.0.0+rev=f5a1d21"; + version = "0.0.0+rev=bb2faa9"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "f5a1d2188ff711a06c6a8daa65bbf2f17c8378a5"; - hash = "sha256-iNoMqyZmS3CoazDQv9/hJb1CRXojEM4IyE5ReqHV4k8="; + rev = "bb2faa992f6915079c2731632fba74874b85d188"; + hash = "sha256-WCjuDebUQu5rW+PEM3KpLWRTbfQVl8bfFMcj2TS8Tyw="; }; location = "sosl"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -2689,12 +2689,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=035354e"; + version = "0.0.0+rev=f2a6b6f"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "035354ea51c835cfe8fc9abf81bb081965a42b4c"; - hash = "sha256-EUOR8VP1u0Sz0HSg+IUSInQ6pD/1k5e3a/r7lPPShYo="; + rev = "f2a6b6f86cd4322c346faa312ddf2b839bf5e989"; + hash = "sha256-8rEUNBP8ZChtPcQVTcVm7tg9E4ImogSYkLA6aw0hz+E="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -2845,12 +2845,12 @@ }; t32 = buildGrammar { language = "t32"; - version = "0.0.0+rev=e9e3345"; + version = "0.0.0+rev=ad23ed0"; src = fetchFromGitLab { owner = "xasc"; repo = "tree-sitter-t32"; - rev = "e9e334539a07ca044128592c41946daa68d626dd"; - hash = "sha256-LHpJHzbxGrx4k4oQYqz8or9GDy5nnm58vQ9d+vATC+4="; + rev = "ad23ed0325658adbb1dfb397d4dfbea8872585c6"; + hash = "sha256-dcz2b0NiaJEQUN6kOk+FVfxqD3wSzolH+NXkPpzrQj4="; }; meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git"; }; @@ -2901,12 +2901,12 @@ }; templ = buildGrammar { language = "templ"; - version = "0.0.0+rev=ebcb4f7"; + version = "0.0.0+rev=9269b5a"; src = fetchFromGitHub { owner = "vrischmann"; repo = "tree-sitter-templ"; - rev = "ebcb4f7a6abde0156f7f2bf7744592afd0ec38b0"; - hash = "sha256-XAUqDtyW2AVmtZ5lqPW1e6OzNXakBRxrhd4PbMzF7jQ="; + rev = "9269b5a65e79be8fb6b6669935823263343b7ba0"; + hash = "sha256-GnL5J5JBx+DW2UbKRGVg3eSDHryvJMs7irOqnWZXpL0="; }; meta.homepage = "https://github.com/vrischmann/tree-sitter-templ"; }; @@ -3059,12 +3059,12 @@ }; typespec = buildGrammar { language = "typespec"; - version = "0.0.0+rev=8455e66"; + version = "0.0.0+rev=42fb163"; src = fetchFromGitHub { owner = "happenslol"; repo = "tree-sitter-typespec"; - rev = "8455e6601de80c9641b6e6f54c7320573eec0300"; - hash = "sha256-Ezl5MuGHqtPhpb6tq7a2z6PDDDiEVzoQCNFCp+Pcang="; + rev = "42fb163442ef2691b9b720fb4e4e846809415d18"; + hash = "sha256-yWXfDC4etuXn1jV8DsSSL028LUXSnsvCaog6ggtd8ro="; }; meta.homepage = "https://github.com/happenslol/tree-sitter-typespec"; }; @@ -3148,12 +3148,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=bbba20d"; + version = "0.0.0+rev=bc2aa29"; src = fetchFromGitHub { owner = "vlang"; repo = "v-analyzer"; - rev = "bbba20d654a764c2d2de272fd5f45a2433870640"; - hash = "sha256-icEa8TeoF/MZILYwS/ZqTUaiBEqoHKVV7etUPwyuIkw="; + rev = "bc2aa2993851ed5ad10caf4571aa2aaee3c80a7f"; + hash = "sha256-SW48kJShPJFgsw8tfI9CwDQvbXj6L09aHl1g+Sl5+mU="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/v-analyzer"; @@ -3193,12 +3193,12 @@ }; vhdl = buildGrammar { language = "vhdl"; - version = "0.0.0+rev=c438173"; + version = "0.0.0+rev=eb15328"; src = fetchFromGitHub { owner = "jpt13653903"; repo = "tree-sitter-vhdl"; - rev = "c438173a3cbb92b349c994f2acf822a0f3b961a0"; - hash = "sha256-R4Gcs1EA3iFCOSuXwUrSgvKlt9t+l9kqZC58EtureV8="; + rev = "eb1532861767a46fc336102bd4ebc938da8773f5"; + hash = "sha256-IEE3uSS+XD8xXrbAzebfiDKGZpoYVOEazAX1tC7L2p8="; }; meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl"; }; @@ -3326,12 +3326,12 @@ }; xresources = buildGrammar { language = "xresources"; - version = "0.0.0+rev=724ce1e"; + version = "0.0.0+rev=3b9f6a8"; src = fetchFromGitHub { owner = "ValdezFOmar"; repo = "tree-sitter-xresources"; - rev = "724ce1e841f2b9097625756a67f5847ff00178db"; - hash = "sha256-WQUC3/y0O0CgJHUTF6onm6iLTzennYEYU47TlzOrrC0="; + rev = "3b9f6a8ecaeae71f4419f31d4975234242eaf867"; + hash = "sha256-Pbap9gmsv2LhhRveYCqvLeZJAzpkr8NAHwtVVkdw7Yw="; }; meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources"; }; From 48d7517fc95d494acbc821520b97447a57d1a6b1 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 19 Dec 2024 21:31:14 -0600 Subject: [PATCH 143/146] vimPlugins.sg-nvim: move out of vim generated --- .../editors/vim/plugins/generated.nix | 12 ---- .../editors/vim/plugins/overrides.nix | 43 +----------- .../editors/vim/plugins/sg-nvim/default.nix | 69 +++++++++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 - 4 files changed, 70 insertions(+), 55 deletions(-) create mode 100644 pkgs/applications/editors/vim/plugins/sg-nvim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index a6b55c4b59e28..249dcf560a85e 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -11254,18 +11254,6 @@ final: prev: meta.homepage = "https://github.com/junegunn/seoul256.vim/"; }; - sg-nvim = buildVimPlugin { - pname = "sg.nvim"; - version = "2024-12-15"; - src = fetchFromGitHub { - owner = "sourcegraph"; - repo = "sg.nvim"; - rev = "7c423ebeb028b3534eb20fe54972825384dbe7d6"; - sha256 = "1d9ag1q9yxiai5hfm0x4am710gqzx3liw4qg10glskjczmgiic00"; - }; - meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; - }; - shabadou-vim = buildVimPlugin { pname = "shabadou.vim"; version = "2016-07-19"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 6d9027d230d98..db4f196701c0b 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -89,7 +89,6 @@ callPackage, # Preview-nvim dependencies md-tui, - # sg.nvim dependencies darwin, # sved dependencies glib, @@ -104,8 +103,6 @@ gnused, makeWrapper, procps, - # sg-nvim dependencies - openssl, pkg-config, # vim-agda dependencies agda, @@ -2648,45 +2645,7 @@ in dependencies = [ self.nui-nvim ]; }; - sg-nvim = super.sg-nvim.overrideAttrs ( - old: - let - sg-nvim-rust = rustPlatform.buildRustPackage { - pname = "sg-nvim-rust"; - inherit (old) version src; - - cargoHash = "sha256-/eY4LD488QZHkKvyc3m9vD96gHhZ1961bp9L56xYq9o="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - - prePatch = '' - rm .cargo/config.toml - ''; - - env.OPENSSL_NO_VENDOR = true; - - cargoBuildFlags = [ "--workspace" ]; - - # tests are broken - doCheck = false; - }; - in - { - dependencies = [ self.plenary-nvim ]; - postInstall = '' - mkdir -p $out/target/debug - ln -s ${sg-nvim-rust}/{bin,lib}/* $out/target/debug - ''; - nvimRequireCheck = "sg"; - } - ); + sg-nvim = callPackage ./sg-nvim { }; skim = buildVimPlugin { pname = "skim"; diff --git a/pkgs/applications/editors/vim/plugins/sg-nvim/default.nix b/pkgs/applications/editors/vim/plugins/sg-nvim/default.nix new file mode 100644 index 0000000000000..3ebc0f3c02041 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/sg-nvim/default.nix @@ -0,0 +1,69 @@ +{ + lib, + fetchFromGitHub, + nix-update-script, + openssl, + pkg-config, + rustPlatform, + vimPlugins, + vimUtils, +}: +let + version = "1.1.0-unstable-2024-12-15"; + src = fetchFromGitHub { + owner = "sourcegraph"; + repo = "sg.nvim"; + rev = "7c423ebeb028b3534eb20fe54972825384dbe7d6"; + hash = "sha256-ALAYX/1MTk0fCA8THunoHz8QTlWkg+pgiSp2n3B4KrU="; + }; + + sg-nvim-rust = rustPlatform.buildRustPackage { + pname = "sg-nvim-rust"; + inherit version src; + + cargoHash = "sha256-t0+0Zw8NjCD1VB1hTrSjOa1130IVanoTALdFoTloFe4="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + prePatch = '' + rm .cargo/config.toml + ''; + + env.OPENSSL_NO_VENDOR = true; + + cargoBuildFlags = [ "--workspace" ]; + + # tests are broken + doCheck = false; + }; +in +vimUtils.buildVimPlugin { + pname = "sg.nvim"; + inherit version src; + + dependencies = [ vimPlugins.plenary-nvim ]; + + postInstall = '' + mkdir -p $out/target/debug + ln -s ${sg-nvim-rust}/{bin,lib}/* $out/target/debug + ''; + + passthru = { + updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + attrPath = "vimPlugins.sg-nvim.sg-nvim-rust"; + }; + + # needed for the update script + inherit sg-nvim-rust; + }; + nvimRequireCheck = "sg"; + + meta = { + description = "Neovim plugin designed to emulate the behaviour of the Cursor AI IDE"; + homepage = "https://github.com/sourcegraph/sg.nvim/"; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index bbb908876dad0..edc72a00fd891 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -934,7 +934,6 @@ https://github.com/megaannum/self/,, https://github.com/jaxbot/semantic-highlight.vim/,, https://github.com/numirias/semshi/,, https://github.com/junegunn/seoul256.vim/,, -https://github.com/sourcegraph/sg.nvim/,HEAD, https://github.com/osyo-manga/shabadou.vim/,, https://github.com/AndrewRadev/sideways.vim/,, https://github.com/skim-rs/skim.vim/,, From 056000897aeac9ac96e18a75708b82c758d7f43e Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 19 Dec 2024 23:13:28 -0600 Subject: [PATCH 144/146] vimPlugins: cleanup unused inputs --- pkgs/applications/editors/vim/plugins/overrides.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index db4f196701c0b..d2a6a05a83c33 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -27,10 +27,8 @@ deno, direnv, duckdb, - fish, fzf, gawk, - git, himalaya, htop, jq, @@ -43,7 +41,6 @@ nim1, nodePackages, openscad, - pandoc, parinfer-rust, phpactor, ranger, From 620e2b8dc15a01d3b0931902c03d41f93e757c07 Mon Sep 17 00:00:00 2001 From: Hans Date: Fri, 20 Dec 2024 18:19:18 +0100 Subject: [PATCH 145/146] tmuxPlugins.sensible: unstable-2017-09-05 -> unstable-2022-08-14 (#191517) --- pkgs/misc/tmux-plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 7863842e1676e..a44aec9b2e71a 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -586,12 +586,12 @@ in rec { sensible = mkTmuxPlugin { pluginName = "sensible"; - version = "unstable-2017-09-05"; + version = "unstable-2022-08-14"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-sensible"; - rev = "e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5"; - sha256 = "1z8dfbwblrbmb8sgb0k8h1q0dvfdz7gw57las8nwd5gj6ss1jyvx"; + rev = "25cb91f42d020f675bb0a2ce3fbd3a5d96119efa"; + sha256 = "sha256-sw9g1Yzmv2fdZFLJSGhx1tatQ+TtjDYNZI5uny0+5Hg="; }; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -e 's:reattach-to-user-namespace:${pkgs.reattach-to-user-namespace}/bin/reattach-to-user-namespace:g' -i $target/sensible.tmux From 3642cf2b1cbb3377023f26c940222758e3b9f67f Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 19 Dec 2024 23:28:06 -0600 Subject: [PATCH 146/146] vimPlugins: remove unnecessary dependency We don't need to include darwin frameworks explicitly anymore. --- pkgs/applications/editors/vim/plugins/default.nix | 2 -- pkgs/applications/editors/vim/plugins/overrides.nix | 8 -------- 2 files changed, 10 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/default.nix b/pkgs/applications/editors/vim/plugins/default.nix index 4ee82593a198a..3a4296b34d0c7 100644 --- a/pkgs/applications/editors/vim/plugins/default.nix +++ b/pkgs/applications/editors/vim/plugins/default.nix @@ -5,7 +5,6 @@ lib, vimUtils, vim, - darwin, llvmPackages, neovim-unwrapped, neovimUtils, @@ -33,7 +32,6 @@ let # If additional modifications to the build process are required, # add to ./overrides.nix. overrides = callPackage ./overrides.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa CoreFoundation CoreServices; inherit buildVimPlugin; inherit llvmPackages; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 4ef06ebcf43c2..d1fc482c02ffd 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -17,7 +17,6 @@ rustPlatform, # Misc dependencies arrow-cpp, - Cocoa, coc-clangd, coc-css, coc-diagnostic, @@ -79,9 +78,6 @@ cmake, icu, ncurses, - # LanguageClient-neovim dependencies - CoreFoundation, - CoreServices, # nvim-treesitter dependencies callPackage, # Preview-nvim dependencies @@ -3137,10 +3133,6 @@ in dependencies = [ self.tlib_vim ]; }; - vim-addon-manager = super.vim-addon-manager.overrideAttrs { - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Cocoa; - }; - vim-addon-mru = super.vim-addon-mru.overrideAttrs { dependencies = with self; [ vim-addon-other