From 1e70721319856d35a86c021cd6620a52facc72a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 9 Apr 2023 03:30:09 +0200 Subject: [PATCH 01/33] Use clickable homepages on packages which are changed in #225362 --- pkgs/development/tools/misc/hound/default.nix | 2 +- pkgs/servers/mattermost/matterircd.nix | 2 +- pkgs/servers/monitoring/prometheus/redis-exporter.nix | 2 +- pkgs/tools/backup/restic/rest-server.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix index 5d0120804f44..8e5ed06b9296 100644 --- a/pkgs/development/tools/misc/hound/default.nix +++ b/pkgs/development/tools/misc/hound/default.nix @@ -33,8 +33,8 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests) hound; }; meta = with lib; { - inherit (src.meta) homepage; description = "Lightning fast code searching made easy"; + homepage = "https://github.com/hound-search/hound"; license = licenses.mit; maintainers = with maintainers; [ grahamc SuperSandro2000 ]; platforms = platforms.unix; diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix index f46eba6f608f..029b1ebfa130 100644 --- a/pkgs/servers/mattermost/matterircd.nix +++ b/pkgs/servers/mattermost/matterircd.nix @@ -16,8 +16,8 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; meta = with lib; { - inherit (src.meta) homepage; description = "Minimal IRC server bridge to Mattermost"; + homepage = "https://github.com/42wim/matterircd"; license = licenses.mit; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index a457a2ee39cf..bad77ac89966 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -26,7 +26,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for Redis metrics"; - inherit (src.meta) homepage; + homepage = "https://github.com/oliver006/redis_exporter"; license = licenses.mit; maintainers = with maintainers; [ eskytthe srhb ma27 ]; platforms = platforms.unix; diff --git a/pkgs/tools/backup/restic/rest-server.nix b/pkgs/tools/backup/restic/rest-server.nix index 0e9a72381ba6..169b8d74eebe 100644 --- a/pkgs/tools/backup/restic/rest-server.nix +++ b/pkgs/tools/backup/restic/rest-server.nix @@ -23,8 +23,8 @@ buildGoModule rec { ]; meta = with lib; { - inherit (src.meta) homepage; description = "A high performance HTTP server that implements restic's REST backend API"; + homepage = "https://github.com/restic/rest-server"; platforms = platforms.unix; license = licenses.bsd2; maintainers = with maintainers; [ dotlambda ]; From 4d057d14ba766b516d8f585b66dbfe8c00cd0d53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 15 Apr 2023 01:07:45 +0200 Subject: [PATCH 02/33] ledfx: init at 2.0.64 --- pkgs/applications/audio/ledfx/default.nix | 73 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 75 insertions(+) create mode 100644 pkgs/applications/audio/ledfx/default.nix diff --git a/pkgs/applications/audio/ledfx/default.nix b/pkgs/applications/audio/ledfx/default.nix new file mode 100644 index 000000000000..507ce0d9a767 --- /dev/null +++ b/pkgs/applications/audio/ledfx/default.nix @@ -0,0 +1,73 @@ +{ lib +, fetchpatch +, python3 +}: + +python3.pkgs.buildPythonPackage rec { + pname = "ledfx"; + version = "2.0.64"; + format = "setuptools"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + hash = "sha256-TKRa4PcMd0Jl94XD2WubOhmsxZaUplZeWKsuKz83Rl4="; + }; + + patches = [ + # replace tcp-latency which is not packaged with icmplib + (fetchpatch { + url = "https://github.com/LedFx/LedFx/commit/98cd4256846ae3bdae7094eeacb3b02a4807dc6f.patch"; + excludes = [ + # only used in win.spec file which is windows specific + "hiddenimports.py" + ]; + hash = "sha256-p9fiLdjZI5fe5Qy2xbJIAtblp/7BwUxAvwjHQy5l9nQ="; + }) + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace '"openrgb-python~=0.2.10",' "" \ + --replace '"pyupdater>=3.1.0",' "" \ + --replace "'rpi-ws281x>=4.3.0; platform_system == \"Linux\"'," "" \ + --replace "~=" ">=" + ''; + + propagatedBuildInputs = with python3.pkgs; [ + aiohttp + aiohttp-cors + aubio + certifi + cython + flux-led + icmplib + multidict + numpy + # openrgb-python # not packaged + paho-mqtt + pillow + psutil + pyserial + pystray + # rpi-ws281x # not packaged + requests + sacn + samplerate + sentry-sdk + sounddevice + uvloop + voluptuous + zeroconf + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "LedFx is a network based LED effect controller with support for advanced real-time audio effects"; + homepage = "https://github.com/LedFx/LedFx"; + changelog = "https://github.com/LedFx/LedFx/blob/${version}/CHANGELOG.rst"; + license = licenses.gpl3Only; + maintainers = teams.c3d2.members; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 183f5d121b06..ff3ca55800cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1360,6 +1360,8 @@ with pkgs; wine = null; }; + ledfx = callPackage ../applications/audio/ledfx { }; + libdislocator = callPackage ../tools/security/afl/libdislocator.nix { }; afpfs-ng = callPackage ../tools/filesystems/afpfs-ng { }; From 72f04d624c2844ea70390cf9362914db3154b45e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Zaffarano?= Date: Sat, 8 Apr 2023 15:40:44 +0200 Subject: [PATCH 03/33] buku: 4.7 -> 4.8 --- pkgs/applications/misc/buku/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 249288c77c16..ab047e080986 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -8,7 +8,6 @@ let flask-api flask-bootstrap flask-paginate - flask-reverse-proxy-fix flask-wtf arrow werkzeug @@ -18,20 +17,20 @@ let ]; in with python3.pkgs; buildPythonApplication rec { - version = "4.7"; + version = "4.8"; pname = "buku"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "sha256-7piJK1hz9h6EWiU/q5MAS1PSvHFxnW7rZBKxq+wda1c="; + sha256 = "sha256-kPVlfTYUusf5CZnKB53WZcCHo3MEnA2bLUHTRPGPn+8="; }; nativeCheckInputs = [ hypothesis pytest - pytest-vcr + pytest-recording pyyaml mypy-extensions click From a5d0c8b2c0cc75962210efc65fa8427ece620ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 26 Apr 2023 14:48:18 +0200 Subject: [PATCH 04/33] hound: 0.6.0 -> 0.7.0 Diff: https://github.com/hound-search/hound/compare/v0.6.0...v0.7.0 --- pkgs/development/tools/misc/hound/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix index 5d0120804f44..977606601e9a 100644 --- a/pkgs/development/tools/misc/hound/default.nix +++ b/pkgs/development/tools/misc/hound/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "hound"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "hound-search"; repo = "hound"; rev = "v${version}"; - sha256 = "sha256-M1c4lsD7DQo5+RCCDdyn9FeGuGngMsg1qSrxM2wCzpg="; + sha256 = "sha256-FqAPywVSkFsdgFpFe5m2+/Biwi11aYybKAhf6h2b//g="; }; - vendorSha256 = "sha256-ZgF/PB3VTPx367JUkhOkSEK1uvqENNG0xuNXvCGENnQ="; + vendorSha256 = "sha256-0psvz4bnhGuwwSAXvQp0ju0GebxoUyY2Rjp/D43KF78="; nativeBuildInputs = [ makeWrapper ]; From e2108a650fa5ee82ecf875cdefa39f1097f55a0c Mon Sep 17 00:00:00 2001 From: 1000101 Date: Wed, 26 Apr 2023 18:28:50 +0200 Subject: [PATCH 05/33] tor-browser-bundle-bin: fix $HOME trailing backslash --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 2f40a1e73e0c..4af2f0286ded 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -291,7 +291,7 @@ stdenv.mkDerivation rec { export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive # Enter local state directory. - REAL_HOME=\$HOME + REAL_HOME=\''${HOME%/} TBB_HOME=\''${TBB_HOME:-''${XDG_DATA_HOME:-\$REAL_HOME/.local/share}/tor-browser} HOME=\$TBB_HOME From b7b2b2ad28d17da94727b364507f772ea9366791 Mon Sep 17 00:00:00 2001 From: Soner Sayakci Date: Thu, 20 Apr 2023 17:22:25 +0200 Subject: [PATCH 06/33] dart-sass-embedded: init at 1.62.1 --- pkgs/misc/dart-sass-embedded/default.nix | 49 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/misc/dart-sass-embedded/default.nix diff --git a/pkgs/misc/dart-sass-embedded/default.nix b/pkgs/misc/dart-sass-embedded/default.nix new file mode 100644 index 000000000000..18ba6f9472cb --- /dev/null +++ b/pkgs/misc/dart-sass-embedded/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenvNoCC +, fetchurl +, autoPatchelfHook +}: + +stdenvNoCC.mkDerivation rec { + pname = "dart-sass-embedded"; + version = "1.62.1"; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = lib.optional stdenvNoCC.hostPlatform.isLinux autoPatchelfHook; + + src = let base = "https://github.com/sass/dart-sass-embedded/releases/download/${version}/sass_embedded-${version}"; in + fetchurl { + "x86_64-linux" = { + url = "${base}-linux-x64.tar.gz"; + hash = "sha256-NXTadacyKlOQNGSLj/hP8syhYuuSTXK2Y9cYzTk28HU="; + }; + "aarch64-linux" = { + url = "${base}-linux-arm64.tar.gz"; + hash = "sha256-DX29U1AjmqVhKFgzP+71vsdoMjQ13IS93PZ1JLOA7bA="; + }; + "x86_64-darwin" = { + url = "${base}-macos-x64.tar.gz"; + hash = "sha256-0oyb9YBKoPNaWFLbIUZOJc5yK11uDYyAKKW4urkmRJQ="; + }; + "aarch64-darwin" = { + url = "${base}-macos-arm64.tar.gz"; + hash = "sha256-dkBcdVbxolK8xXYaOHot0s9FxGmfhMNAEoZqo+2LRfk="; + }; + }."${stdenvNoCC.hostPlatform.system}" or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); + + installPhase = '' + mkdir -p $out/bin + cp -r * $out + ln -s $out/dart-sass-embedded $out/bin/dart-sass-embedded + ''; + + meta = with lib; { + description = "A wrapper for Dart Sass that implements the compiler side of the Embedded Sass protocol"; + homepage = "https://github.com/sass/dart-sass-embedded"; + changelog = "https://github.com/sass/dart-sass-embedded/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ shyim ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82e27448e190..a3e210c8c1c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16632,6 +16632,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + dart-sass-embedded = callPackage ../misc/dart-sass-embedded { }; + clojupyter = callPackage ../applications/editors/jupyter-kernels/clojupyter { jre = jre8; }; From 9092b9b5df3114c4db36036fb6c9c949d223ed40 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 27 Apr 2023 22:23:56 -0400 Subject: [PATCH 07/33] Revert "root: enable root7 (#226351)" This reverts commit cafa2f02fbbcade5c5c257c190061da555d90913. --- pkgs/applications/science/misc/root/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 2ebfd4a1a87a..037b8dfa09c7 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -191,7 +191,7 @@ stdenv.mkDerivation rec { "-Dpythia6=OFF" "-Dpythia8=OFF" "-Drfio=OFF" - "-Droot7=ON" + "-Droot7=OFF" "-Dsqlite=OFF" "-Dssl=ON" "-Dtmva=ON" From 0c43bce82e84c0036283dce427a88694df4fdc95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 28 Apr 2023 11:01:22 +0200 Subject: [PATCH 08/33] gitea: 1.19.1 -> 1.19.2 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 6f38b2f7c63d..9d78f7793efa 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -19,12 +19,12 @@ buildGoModule rec { pname = "gitea"; - version = "1.19.1"; + version = "1.19.2"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz"; - hash = "sha256-i2exxgVsQhQtojJkyFJgBejCj6dSRo30ESEtN9n7Vfk="; + hash = "sha256-L0wedLLQ8NBiw7JQ5AiFa+kQb+Vg0jnBtSGtgIknIDg="; }; vendorHash = null; From ad87bf2ac84dde2fd2bf89bc41abb0c26d0cfaee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 Apr 2023 11:27:12 +0200 Subject: [PATCH 09/33] python310Packages.prometheus-flask-exporter: 0.20.3 -> 0.22.4 Diff: https://github.com/rycus86/prometheus_flask_exporter/compare/0.20.3...0.22.4 --- .../python-modules/prometheus-flask-exporter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prometheus-flask-exporter/default.nix b/pkgs/development/python-modules/prometheus-flask-exporter/default.nix index ac50bf781c0f..4b845b3789be 100644 --- a/pkgs/development/python-modules/prometheus-flask-exporter/default.nix +++ b/pkgs/development/python-modules/prometheus-flask-exporter/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "prometheus-flask-exporter"; - version = "0.20.3"; + version = "0.22.4"; src = fetchFromGitHub { owner = "rycus86"; repo = "prometheus_flask_exporter"; rev = version; - hash = "sha256-l9Iw9fvXQMXzq1y/4Dml8uLPJWyqX6SDIXptJVw3cVQ="; + hash = "sha256-GAQ80J7at8Apqu+DUMN3+rLi/lrNv5Y7w/DKpUN2iu8="; }; propagatedBuildInputs = [ flask prometheus-client ]; From f88be465561a97bfe826474f3d2c900d4faa7c0b Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Fri, 28 Apr 2023 12:14:58 +0200 Subject: [PATCH 10/33] discourse: 3.1.0.beta2 -> 3.1.0.beta4 https://meta.discourse.org/t/3-1-0-beta4-new-notifications-menu-chat-and-sidebar-improvements-security-fixes-and-more/262044 https://meta.discourse.org/t/3-1-0-beta3-search-optimizations-resizable-chat-drawer-new-api-scopes-and-more/258274 diff: https://github.com/discourse/discourse/compare/v3.1.0.beta2..v3.1.0.beta4 --- nixos/modules/services/web-apps/discourse.nix | 3 + .../asserts_patch-package_from_path.patch | 13 + pkgs/servers/web-apps/discourse/default.nix | 32 +- .../web-apps/discourse/rubyEnv/Gemfile | 18 +- .../web-apps/discourse/rubyEnv/Gemfile.lock | 217 +++++------ .../web-apps/discourse/rubyEnv/gemset.nix | 351 ++++++++++-------- .../rubyEnv/sass-embedded-static.patch | 21 ++ 7 files changed, 375 insertions(+), 280 deletions(-) create mode 100644 pkgs/servers/web-apps/discourse/asserts_patch-package_from_path.patch create mode 100644 pkgs/servers/web-apps/discourse/rubyEnv/sass-embedded-static.patch diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index 5b2bd5aeeb09..f80eb6b4c7f0 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -651,6 +651,9 @@ in preload_link_header = false; redirect_avatar_requests = false; pg_force_readonly_mode = false; + dns_query_timeout_secs = null; + regex_timeout_seconds = 2; + allow_impersonation = true; }; services.redis.servers.discourse = diff --git a/pkgs/servers/web-apps/discourse/asserts_patch-package_from_path.patch b/pkgs/servers/web-apps/discourse/asserts_patch-package_from_path.patch new file mode 100644 index 000000000000..9f7d98b069f4 --- /dev/null +++ b/pkgs/servers/web-apps/discourse/asserts_patch-package_from_path.patch @@ -0,0 +1,13 @@ +diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json +index 9e4533d2..e57f8a5f 100644 +--- a/app/assets/javascripts/discourse/package.json ++++ b/app/assets/javascripts/discourse/package.json +@@ -14,7 +14,7 @@ + "build": "ember build", + "start": "ember serve", + "test": "ember test", +- "postinstall": "yarn --silent --cwd .. patch-package" ++ "postinstall": "patch-package" + }, + "dependencies": { + "@babel/core": "^7.21.4", diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 504a96d36147..05a961e59270 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -8,7 +8,7 @@ , bundlerEnv , callPackage -, ruby_3_1 +, ruby_3_2 , replace , gzip , gnutar @@ -38,21 +38,22 @@ , fixup_yarn_lock , nodePackages , nodejs_16 +, dart-sass-embedded , plugins ? [] }@args: let - version = "3.1.0.beta2"; + version = "3.1.0.beta4"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-wkNTm5/QyujPcMUrnc6eWmjhrRQAthhmejmjpy6zmbE="; + sha256 = "sha256-22GXFYPjPYL20amR4xFB4L/dCp32H4Z3uf0GLGEghUE="; }; - ruby = ruby_3_1; + ruby = ruby_3_2; runtimeDeps = [ # For backups, themes and assets @@ -186,6 +187,20 @@ let cp $(readlink -f ${libpsl}/lib/libpsl.so) vendor/libpsl.x86_64.so ''; }; + sass-embedded = gems.sass-embedded // { + dontBuild = false; + # `sass-embedded` depends on `dart-sass-embedded` and tries to + # fetch that as `.tar.gz` from GitHub releases. That `.tar.gz` + # can also be specified via `SASS_EMBEDDED`. But instead of + # compressing our `dart-sass-embedded` just to decompress it + # again, we simply patch the Rakefile to symlink that path. + patches = [ + ./rubyEnv/sass-embedded-static.patch + ]; + postPatch = '' + export SASS_EMBEDDED=${dart-sass-embedded} + ''; + }; }; groups = [ @@ -199,7 +214,7 @@ let yarnOfflineCache = fetchYarnDeps { yarnLock = src + "/app/assets/javascripts/yarn.lock"; - sha256 = "0ryc4p5s35mzg1p71z98x5fvr5fpldmgghdi1viha4ckbpv153lw"; + sha256 = "0a20kns4irdpzzx2dvdjbi0m3s754gp737q08z5nlcnffxqvykrk"; }; nativeBuildInputs = runtimeDeps ++ [ @@ -207,6 +222,7 @@ let redis nodePackages.uglify-js nodePackages.terser + nodePackages.patch-package yarn nodejs_16 ]; @@ -226,6 +242,12 @@ let # Fix the rake command used to recursively execute itself in the # assets precompilation task. ./assets_rake_command.patch + + # `app/assets/javascripts/discourse/package.json`'s postinstall + # hook tries to call `../node_modules/.bin/patch-package`, which + # hasn't been `patchShebangs`-ed yet. So instead we just use + # `patch-package` from `nativeBuildInputs`. + ./asserts_patch-package_from_path.patch ]; # We have to set up an environment that is close enough to diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile index 4bd110bf4bfc..72cc4660cb0f 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile @@ -18,7 +18,7 @@ else # this allows us to include the bits of rails we use without pieces we do not. # # To issue a rails update bump the version number here - rails_version = "7.0.4.1" + rails_version = "7.0.4.3" gem "actionmailer", rails_version gem "actionpack", rails_version gem "actionview", rails_version @@ -41,7 +41,7 @@ gem "actionview_precompiler", require: false gem "discourse-seed-fu" -gem "mail", git: "https://github.com/discourse/mail.git" +gem "mail" gem "mini_mime" gem "mini_suffix" @@ -71,8 +71,6 @@ gem "rails_multisite" gem "fast_xs", platform: :ruby -gem "xorcist" - gem "fastimage" gem "aws-sdk-s3", require: false @@ -105,7 +103,7 @@ gem "pg" gem "mini_sql" gem "pry-rails", require: false gem "pry-byebug", require: false -gem "r2", require: false +gem "rtlcss", require: false gem "rake" gem "thor", require: false @@ -180,6 +178,7 @@ group :development do gem "better_errors", platform: :mri, require: !!ENV["BETTER_ERRORS"] gem "binding_of_caller" gem "yaml-lint" + gem "yard" end if ENV["ALLOW_DEV_POPULATE"] == "1" @@ -229,10 +228,9 @@ gem "logstash-event", require: false gem "logstash-logger", require: false gem "logster" -# NOTE: later versions of sassc are causing a segfault, possibly dependent on processer architecture -# and until resolved should be locked at 2.0.1 -gem "sassc", "2.0.1", require: false -gem "sassc-rails" +# These are forks of sassc and sassc-rails with dart-sass support +gem "dartsass-ruby" +gem "dartsass-sprockets" gem "rotp", require: false @@ -279,3 +277,5 @@ gem "webrick", require: false # Workaround until Ruby ships with cgi version 0.3.6 or higher. gem "cgi", ">= 0.3.6", require: false + +gem "tzinfo-data" diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index b211c594948f..22bf3b726468 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -1,10 +1,3 @@ -GIT - remote: https://github.com/discourse/mail.git - revision: 5b700fc95ee66378e0cf2559abc73c8bc3062a4b - specs: - mail (2.8.0.edge) - mini_mime (>= 0.1.1) - GIT remote: https://github.com/rails/sprockets revision: f4d3dae71ef29c44b75a49cfbf8032cce07b423a @@ -17,25 +10,25 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (7.0.4.1) - actionpack (= 7.0.4.1) - actionview (= 7.0.4.1) - activejob (= 7.0.4.1) - activesupport (= 7.0.4.1) + actionmailer (7.0.4.3) + actionpack (= 7.0.4.3) + actionview (= 7.0.4.3) + activejob (= 7.0.4.3) + activesupport (= 7.0.4.3) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.4.1) - actionview (= 7.0.4.1) - activesupport (= 7.0.4.1) + actionpack (7.0.4.3) + actionview (= 7.0.4.3) + activesupport (= 7.0.4.3) rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.4.1) - activesupport (= 7.0.4.1) + actionview (7.0.4.3) + activesupport (= 7.0.4.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -44,20 +37,20 @@ GEM actionview (>= 6.0.a) active_model_serializers (0.8.4) activemodel (>= 3.0) - activejob (7.0.4.1) - activesupport (= 7.0.4.1) + activejob (7.0.4.3) + activesupport (= 7.0.4.3) globalid (>= 0.3.6) - activemodel (7.0.4.1) - activesupport (= 7.0.4.1) - activerecord (7.0.4.1) - activemodel (= 7.0.4.1) - activesupport (= 7.0.4.1) - activesupport (7.0.4.1) + activemodel (7.0.4.3) + activesupport (= 7.0.4.3) + activerecord (7.0.4.3) + activemodel (= 7.0.4.3) + activesupport (= 7.0.4.3) + activesupport (7.0.4.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.1) + addressable (2.8.4) public_suffix (>= 2.0.2, < 6.0) annotate (3.2.0) activerecord (>= 3.2, < 8.0) @@ -88,14 +81,14 @@ GEM rack (>= 0.9.0) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - bootsnap (1.15.0) + bootsnap (1.16.0) msgpack (~> 1.2) builder (3.2.4) bullet (7.0.7) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.1.3) - capybara (3.38.0) + capybara (3.39.0) addressable matrix mini_mime (>= 0.1.3) @@ -110,8 +103,8 @@ GEM chunky_png (1.4.0) coderay (1.1.3) colored2 (3.1.2) - concurrent-ruby (1.2.0) - connection_pool (2.3.0) + concurrent-ruby (1.2.2) + connection_pool (2.4.0) cose (1.3.0) cbor (~> 0.5.9) openssl-signature_algorithm (~> 1.0) @@ -121,6 +114,14 @@ GEM crass (1.0.6) css_parser (1.14.0) addressable + dartsass-ruby (3.0.1) + sass-embedded (~> 1.54) + dartsass-sprockets (3.0.0) + dartsass-ruby (~> 3.0) + railties (>= 4.0.0) + sprockets (> 3.0) + sprockets-rails + tilt date (3.3.3) debug_inspector (1.1.0) diff-lcs (1.5.0) @@ -138,7 +139,7 @@ GEM regexp_parser (~> 2.2) email_reply_trimmer (0.1.13) erubi (1.12.0) - excon (0.97.2) + excon (0.99.0) execjs (2.8.1) exifr (1.3.10) fabrication (2.30.0) @@ -149,7 +150,7 @@ GEM faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) - faraday-retry (2.0.0) + faraday-retry (2.1.0) faraday (~> 2.0) fast_blank (1.0.1) fast_xs (0.8.0) @@ -157,8 +158,9 @@ GEM ffi (1.15.5) fspath (3.1.2) gc_tracer (1.5.1) - globalid (1.0.1) + globalid (1.1.0) activesupport (>= 5.0) + google-protobuf (3.22.3) guess_html_encoding (0.0.11) hana (1.3.7) hashdiff (1.0.1) @@ -169,7 +171,7 @@ GEM http_accept_language (2.1.1) i18n (1.12.0) concurrent-ruby (~> 1.0) - image_optim (0.31.2) + image_optim (0.31.3) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) image_size (>= 1.5, < 4) @@ -186,7 +188,7 @@ GEM hana (~> 1.3) regexp_parser (~> 2.0) uri_template (~> 0.7) - jwt (2.6.0) + jwt (2.7.0) kgio (2.11.4) libv8-node (16.10.0.0) listen (3.8.0) @@ -201,12 +203,17 @@ GEM logstash-event (1.2.02) logstash-logger (0.26.1) logstash-event (~> 1.2) - logster (2.11.3) - loofah (2.19.1) + logster (2.12.2) + loofah (2.20.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lru_redux (1.1.0) lz4-ruby (0.3.3) + mail (2.8.1) + mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp matrix (0.4.2) maxminddb (0.1.22) memory_profiler (1.0.1) @@ -222,10 +229,10 @@ GEM mini_sql (1.4.0) mini_suffix (0.3.3) ffi (~> 1.9) - minitest (5.17.0) + minitest (5.18.0) mocha (2.0.2) ruby2_keywords (>= 0.0.5) - msgpack (1.6.0) + msgpack (1.7.0) multi_json (1.15.0) multi_xml (0.6.0) mustache (1.1.1) @@ -240,8 +247,8 @@ GEM timeout net-smtp (0.3.3) net-protocol - nio4r (2.5.8) - nokogiri (1.14.0) + nio4r (2.5.9) + nokogiri (1.14.3) mini_portile2 (~> 2.8.0) racc (~> 1.4) oauth (1.1.0) @@ -279,17 +286,17 @@ GEM omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack - openssl (3.0.2) - openssl-signature_algorithm (1.2.1) - openssl (> 2.0, < 3.1) + openssl (3.1.0) + openssl-signature_algorithm (1.3.0) + openssl (> 2.0) optimist (3.0.1) parallel (1.22.1) - parallel_tests (4.1.0) + parallel_tests (4.2.0) parallel - parser (3.2.0.0) + parser (3.2.2.0) ast (~> 2.4.1) - pg (1.4.5) - prettier_print (1.2.0) + pg (1.4.6) + prettier_print (1.2.1) progress (3.6.0) pry (0.14.2) coderay (~> 1.1) @@ -300,38 +307,37 @@ GEM pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (5.0.1) - puma (6.0.2) + puma (6.2.1) nio4r (~> 2.0) - r2 (0.2.7) racc (1.6.2) - rack (2.2.6.2) - rack-mini-profiler (3.0.0) + rack (2.2.6.4) + rack-mini-profiler (3.1.0) rack (>= 1.2.0) - rack-protection (3.0.5) + rack-protection (3.0.6) rack - rack-test (2.0.2) + rack-test (2.1.0) rack (>= 1.3) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.5.0) loofah (~> 2.19, >= 2.19.1) - rails_failover (0.8.1) + rails_failover (1.0.0) activerecord (> 6.0, < 7.1) concurrent-ruby railties (> 6.0, < 7.1) rails_multisite (4.0.1) activerecord (> 5.0, < 7.1) railties (> 5.0, < 7.1) - railties (7.0.4.1) - actionpack (= 7.0.4.1) - activesupport (= 7.0.4.1) + railties (7.0.4.3) + actionpack (= 7.0.4.3) + activesupport (= 7.0.4.3) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) rainbow (3.1.1) - raindrops (0.20.0) + raindrops (0.20.1) rake (13.0.6) rb-fsevent (0.11.2) rb-inotify (0.10.1) @@ -341,10 +347,10 @@ GEM msgpack (>= 0.4.3) optimist (>= 3.0.0) rchardet (1.8.0) - redis (4.8.0) + redis (4.8.1) redis-namespace (1.10.0) redis (>= 4) - regexp_parser (2.6.2) + regexp_parser (2.8.0) request_store (1.5.1) rack (>= 1.4) rexml (3.2.5) @@ -358,7 +364,7 @@ GEM rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) rspec-mocks (~> 3.12.0) - rspec-core (3.12.0) + rspec-core (3.12.1) rspec-support (~> 3.12.0) rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) @@ -366,7 +372,7 @@ GEM rspec-html-matchers (0.10.0) nokogiri (~> 1) rspec (>= 3.0.0.a) - rspec-mocks (3.12.3) + rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-rails (6.0.1) @@ -385,46 +391,42 @@ GEM json-schema (>= 2.2, < 4.0) railties (>= 3.1, < 7.1) rspec-core (>= 2.14) - rubocop (1.44.0) + rtlcss (0.2.0) + mini_racer (~> 0.6.3) + rubocop (1.50.2) json (~> 2.3) parallel (~> 1.10) parser (>= 3.2.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.24.1, < 2.0) + rubocop-ast (>= 1.28.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.24.1) - parser (>= 3.1.1.0) - rubocop-capybara (2.17.0) + rubocop-ast (1.28.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.17.1) rubocop (~> 1.41) - rubocop-discourse (3.0.3) + rubocop-discourse (3.2.0) rubocop (>= 1.1.0) rubocop-rspec (>= 2.0.0) - rubocop-rspec (2.18.1) + rubocop-rspec (2.19.0) rubocop (~> 1.33) rubocop-capybara (~> 2.17) - ruby-prof (1.4.5) - ruby-progressbar (1.11.0) + ruby-prof (1.6.1) + ruby-progressbar (1.13.0) ruby-readability (0.7.0) guess_html_encoding (>= 0.0.4) nokogiri (>= 1.6.0) ruby2_keywords (0.0.5) rubyzip (2.3.2) - sanitize (6.0.0) + sanitize (6.0.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) - sassc (2.0.1) - ffi (~> 1.9) - rake - sassc-rails (2.1.2) - railties (>= 4.0.0) - sassc (>= 2.0) - sprockets (> 3.0) - sprockets-rails - tilt - selenium-webdriver (4.8.0) + sass-embedded (1.62.0) + google-protobuf (~> 3.21) + rake (>= 10.0.0) + selenium-webdriver (4.8.6) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -448,16 +450,18 @@ GEM activesupport (>= 5.2) sprockets (>= 3.0.0) sshkey (2.0.0) - stackprof (0.2.23) - syntax_tree (5.2.0) + stackprof (0.2.25) + syntax_tree (6.1.1) prettier_print (>= 1.2.0) syntax_tree-disable_ternary (1.0.0) - test-prof (1.1.0) + test-prof (1.2.1) thor (1.2.1) - tilt (2.0.11) - timeout (0.3.1) - tzinfo (2.0.5) + tilt (2.1.0) + timeout (0.3.2) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) + tzinfo-data (1.2023.3) + tzinfo (>= 1.0.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) unf (0.1.4) @@ -468,9 +472,9 @@ GEM kgio (~> 2.6) raindrops (~> 0.7) uniform_notifier (1.16.0) - uri (0.12.0) + uri (0.12.1) uri_template (0.7.0) - version_gem (1.1.1) + version_gem (1.1.2) web-push (3.0.0) hkdf (~> 1.0) jwt (~> 2.0) @@ -485,24 +489,24 @@ GEM hashdiff (>= 0.4.0, < 2.0.0) webrick (1.7.0) websocket (1.2.9) - xorcist (1.1.3) xpath (3.2.0) nokogiri (~> 1.8) yaml-lint (0.1.2) - zeitwerk (2.6.6) + yard (0.9.34) + zeitwerk (2.6.7) PLATFORMS ruby DEPENDENCIES - actionmailer (= 7.0.4.1) - actionpack (= 7.0.4.1) - actionview (= 7.0.4.1) + actionmailer (= 7.0.4.3) + actionpack (= 7.0.4.3) + actionview (= 7.0.4.3) actionview_precompiler active_model_serializers (~> 0.8.3) - activemodel (= 7.0.4.1) - activerecord (= 7.0.4.1) - activesupport (= 7.0.4.1) + activemodel (= 7.0.4.3) + activerecord (= 7.0.4.3) + activesupport (= 7.0.4.3) addressable annotate aws-sdk-s3 @@ -520,6 +524,8 @@ DEPENDENCIES cose cppjieba_rb css_parser + dartsass-ruby + dartsass-sprockets diffy digest discourse-fonts @@ -551,7 +557,7 @@ DEPENDENCIES loofah lru_redux lz4-ruby - mail! + mail maxminddb memory_profiler message_bus @@ -581,13 +587,12 @@ DEPENDENCIES pry-byebug pry-rails puma - r2 rack rack-mini-profiler rack-protection rails_failover rails_multisite - railties (= 7.0.4.1) + railties (= 7.0.4.3) rake rb-fsevent rbtrace @@ -602,13 +607,12 @@ DEPENDENCIES rspec-rails rss rswag-specs + rtlcss rubocop-discourse ruby-prof ruby-readability rubyzip sanitize - sassc (= 2.0.1) - sassc-rails selenium-webdriver shoulda-matchers sidekiq @@ -621,6 +625,7 @@ DEPENDENCIES syntax_tree-disable_ternary test-prof thor + tzinfo-data uglifier unf unicorn @@ -628,8 +633,8 @@ DEPENDENCIES webdrivers webmock webrick - xorcist yaml-lint + yard BUNDLED WITH - 2.4.6 + 2.4.10 diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index 180214df0cb9..d407a53befc6 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v4ra6jx4bynzj3im6fjbyyy1h6582qg72r6i42myls84z75qsxk"; + sha256 = "112ga1x7y5l0fmammlwajzqxp0fbg1ciw7f6ad9a55wrb0n3hk3y"; type = "gem"; }; - version = "7.0.4.1"; + version = "7.0.4.3"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g823r92w9c1si2mxd82mibdva1fyw0ccin0dc2bpbszk6zfyxrh"; + sha256 = "1cb0hqkfkc0b9s7swvi4nf64c24i3ma1gv09anr8a81k56s0rwxd"; type = "gem"; }; - version = "7.0.4.1"; + version = "7.0.4.3"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pfnbkq1hzzxzrnc0m1dd0l2cad6x041dfv3ndrkk5llcjarphx2"; + sha256 = "1h9027sqzfcbc84dnzw8nxjyg15zrk1y2fc0468wg1xi9nmyw96z"; type = "gem"; }; - version = "7.0.4.1"; + version = "7.0.4.3"; }; actionview_precompiler = { dependencies = ["actionview"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yrjvd2w3l6fd5s984hn885dwcxj078ggfbbr1cpynjnqxrvvm6f"; + sha256 = "08xawfj8lkxlfwnmx3f7324w126rli6mqdx9j6ybz2ks9vxz0x3w"; type = "gem"; }; - version = "7.0.4.1"; + version = "7.0.4.3"; }; activemodel = { dependencies = ["activesupport"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y1v2jy4cwi6dkd9yr399kw53smaiyiqx7bsnljwmsz98g125sdw"; + sha256 = "0ymhsxgdb68zgf4zp07g2bymmpgn0b9r38avn9pagz1p5zy1ql9v"; type = "gem"; }; - version = "7.0.4.1"; + version = "7.0.4.3"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c3wvrym6ib2a6ljc4n572gsrr46hazp7f0zijm8jdc8zp3yx5vi"; + sha256 = "01wb98i2zsbb4jcb4i6z72vb05wiks4hv9chc66h1rsxrv0zi4dv"; type = "gem"; }; - version = "7.0.4.1"; + version = "7.0.4.3"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j0ms94ng1hsxb37aar5j3n4mabjqvjkcl70adjrqib7grriyq7b"; + sha256 = "15m0b1im6i401ab51vzr7f8nk8kys1qa0snnl741y3sir3xd07jp"; type = "gem"; }; - version = "7.0.4.1"; + version = "7.0.4.3"; }; addressable = { dependencies = ["public_suffix"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; + sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.4"; }; annotate = { dependencies = ["activerecord" "rake"]; @@ -241,10 +241,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ln89f9ypzincd5hqgmzd5vvfgf7fgir56v1spsri40ma88vnipj"; + sha256 = "1vcg52gwl64xhhal6kwk1pc01y1klzdlnv1awyk89kb91z010x7q"; type = "gem"; }; - version = "1.15.0"; + version = "1.16.0"; }; builder = { groups = ["default" "development" "test"]; @@ -287,10 +287,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "123198zk2ak8mziwa5jc3ckgpmsg08zn064n3aywnqm9s1bwjv3v"; + sha256 = "06b4nlhirsq8ny17s8zgz7qyvl9v41rixj1xkviiiwxlnjz982d3"; type = "gem"; }; - version = "3.38.0"; + version = "3.39.0"; }; cbor = { groups = ["default"]; @@ -361,20 +361,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5"; + sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; type = "gem"; }; - version = "1.2.0"; + version = "1.2.2"; }; connection_pool = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nj4r58m5cpfdsijj6gjfs3yzcnxq2halagjk07wjcrgj6z8ayb7"; + sha256 = "0dndngqvkm2ih3wqn5ilf9980c1cc57lqn5lywx3myalzpilq05z"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; cose = { dependencies = ["cbor" "openssl-signature_algorithm"]; @@ -429,6 +429,28 @@ }; version = "1.14.0"; }; + dartsass-ruby = { + dependencies = ["sass-embedded"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z3gdsnyvdjgn9gwia72irqgxq04i8hv9pv60yqkd4h5nk9rx4p6"; + type = "gem"; + }; + version = "3.0.1"; + }; + dartsass-sprockets = { + dependencies = ["dartsass-ruby" "railties" "sprockets" "sprockets-rails" "tilt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1842k5i96iiz264wzzqar2m3whs2caf0d8yhbsr6qdbi4j5pzmcx"; + type = "gem"; + }; + version = "3.0.0"; + }; date = { groups = ["default"]; platforms = []; @@ -561,10 +583,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17prxavwwskpv7dfl3npl0pgqiqg99rrmakqj1n4m5hl69jqz8y4"; + sha256 = "0j826kfvzn7nc5pv950n270r0sx1702k988ad11cdlav3dcxxw09"; type = "gem"; }; - version = "0.97.2"; + version = "0.99.0"; }; execjs = { groups = ["assets" "default"]; @@ -644,10 +666,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07bn75d784ndj9ljqk19ff6217hkqqmxjlnjx5b9v36k2nnj9kys"; + sha256 = "1zz0w4jpfa6h1wlirfcs9hzvlpijnd1nnmjq94w5yv50585p279n"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.0"; }; fast_blank = { groups = ["default"]; @@ -735,10 +757,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "040bxzfd7mz1p6z4bc9vk5yrf762hdllvf98hmk848fq28xc5dsk"; + sha256 = "0kqm5ndzaybpnpxqiqkc41k4ksyxl41ln8qqr6kb130cdxsf2dxk"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; + }; + google-protobuf = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xcg53yz44cqhcpb85w3ay80kvnniy0v441c9p08wb6zzia2mnq9"; + type = "gem"; + }; + version = "3.22.3"; }; guess_html_encoding = { groups = ["default"]; @@ -837,10 +869,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0acrqj9g8x39lz3z9li52wwc98d0csqarc7bv6jcfd0fp6h9zykb"; + sha256 = "02iw1plldayr1l8bdw2gshq0h083h0fxwji1m1nfhzikz917c07p"; type = "gem"; }; - version = "0.31.2"; + version = "0.31.3"; }; image_size = { groups = ["default"]; @@ -909,10 +941,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x8zp1a2pnngxh7631s0kn0r665qkwzfp16kifmp93r4zj6ci8v8"; + sha256 = "09yj3z5snhaawh2z1w45yyihzmh57m6m7dp8ra8gxavhj5kbiq5p"; type = "gem"; }; - version = "2.6.0"; + version = "2.7.0"; }; kgio = { groups = ["default"]; @@ -998,10 +1030,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01n1ynk2xa94za8hhqy3xzfwhm24zhh3x5yllziyz3zjxxrj7fxc"; + sha256 = "18yqcf756rzxdq5pw2qrximfryv15ib7rv2g622wjig7zhvk8wx4"; type = "gem"; }; - version = "2.11.3"; + version = "2.12.2"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -1009,10 +1041,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c"; + sha256 = "1mi4ia13fisc97fzd8xcd9wkjdki7zfbmdn1xkdzplicir68gyp8"; type = "gem"; }; - version = "2.19.1"; + version = "2.20.0"; }; lru_redux = { groups = ["default"]; @@ -1041,17 +1073,15 @@ version = "0.3.3"; }; mail = { - dependencies = ["mini_mime"]; + dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"]; groups = ["default"]; platforms = []; source = { - fetchSubmodules = false; - rev = "5b700fc95ee66378e0cf2559abc73c8bc3062a4b"; - sha256 = "0j084s1gsdwiqvm4jdayi0x4rsdrazqv8z8wkz28v7zmaymw18lz"; - type = "git"; - url = "https://github.com/discourse/mail.git"; + remotes = ["https://rubygems.org"]; + sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc"; + type = "gem"; }; - version = "2.8.0.edge"; + version = "2.8.1"; }; matrix = { groups = ["default" "test"]; @@ -1176,10 +1206,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0"; + sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06"; type = "gem"; }; - version = "5.17.0"; + version = "5.18.0"; }; mocha = { dependencies = ["ruby2_keywords"]; @@ -1201,10 +1231,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q03pb0vq8388s431nbxabsfxnch6p304c8vnjlk0zzpcv713yr3"; + sha256 = "172ky0r1jfcm3xyg067pia7k1lhc15vw9svv93max120gcdbrvji"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; multi_json = { groups = ["default"]; @@ -1296,10 +1326,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v"; + sha256 = "0w9978zwjf1qhy3amkivab0f9syz6a7k0xgydjidaf7xc831d78f"; type = "gem"; }; - version = "2.5.8"; + version = "2.5.9"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -1307,10 +1337,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fqld4wnamj7awdr1lwdifpylqdrrg5adm8xj2jl9sc5ms3nxjjm"; + sha256 = "0fnw0z8zl8b5k35g9m5hhc1g4s6ajzjinhyxnqjrx7l7p07fw71v"; type = "gem"; }; - version = "1.14.0"; + version = "1.14.3"; }; oauth = { dependencies = ["oauth-tty" "snaky_hash" "version_gem"]; @@ -1437,10 +1467,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mcg47zz4w902cq6c8cdj62npawgwq68sfh7n7aqy7vm3pgvls9h"; + sha256 = "0c649921vg2l939z5cc3jwd8p1v49099pdhxfk7sb9qqx5wi5873"; type = "gem"; }; - version = "3.0.2"; + version = "3.1.0"; }; openssl-signature_algorithm = { dependencies = ["openssl"]; @@ -1448,10 +1478,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rwjga70kbg0rmwgksb2if34ndh9cy0fgrimkx3hjz9c68ssvpxg"; + sha256 = "103yjl68wqhl5kxaciir5jdnyi7iv9yckishdr52s5knh9g0pd53"; type = "gem"; }; - version = "1.2.1"; + version = "1.3.0"; }; optimist = { groups = ["default"]; @@ -1483,10 +1513,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p0y8cgdmfwyg7plwlsjf9afshm81wj9ah8nprmpfrv28adg3vn6"; + sha256 = "11lf8vsh6kxzp7k3xzkxdmb31b01phaz5z8a7sjpq9hh6ab30k8l"; type = "gem"; }; - version = "4.1.0"; + version = "4.2.0"; }; parser = { dependencies = ["ast"]; @@ -1494,30 +1524,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zk8mdyr0322r11d63rcp5jhz4lakxilhvyvdv0ql5dw4lb83623"; + sha256 = "0s5afi89p76k8vpwiqvh343pm5l23ijqlpszhz65afym3zpkxhzx"; type = "gem"; }; - version = "3.2.0.0"; + version = "3.2.2.0"; }; pg = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wd6nl81nbdwck04hccsm7wf23ghpi8yddd9j4rbwyvyj0sbsff1"; + sha256 = "07m6lxljabw9kyww5k5lgsxsznsm1v5l14r1la09gqka9b5kv3yr"; type = "gem"; }; - version = "1.4.5"; + version = "1.4.6"; }; prettier_print = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bbw4czjr2ch6m57rgjib5a35hx3g18975vwzm2iwq13pvdj9hzk"; + sha256 = "1ybgks9862zmlx71zd4j20ky86fsrp6j6m0az4hzzb1zyaskha57"; type = "gem"; }; - version = "1.2.0"; + version = "1.2.1"; }; progress = { groups = ["default"]; @@ -1578,20 +1608,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15hj8r6wp23k187ajmp13kldk53ygm84q4caq7nlndrn8jlcsps0"; + sha256 = "0qqd5lb3mamh53ssx0xavmspg4blhq6hd1kipksw20bq71xcklf5"; type = "gem"; }; - version = "6.0.2"; - }; - r2 = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wk0p55zp3l96xy5ps28b33dn5z0jwsjl74bwfdn6z81pzjs5sfk"; - type = "gem"; - }; - version = "0.2.7"; + version = "6.2.1"; }; racc = { groups = ["default" "development" "test"]; @@ -1612,10 +1632,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb"; + sha256 = "1qgwkcb8kxns8d5187cxjaxf18b7dmg9gh6cr9c1125m0bj2pnfk"; type = "gem"; }; - version = "2.2.6.2"; + version = "2.2.6.4"; }; rack-mini-profiler = { dependencies = ["rack"]; @@ -1623,10 +1643,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "121fqk18x1bd52c2bkz8wkvv9nkgpqphj5aycnb7lkf67jkwic0h"; + sha256 = "13dhpp1iljhqp9c8akmp6gjhx47qf83w12ns4bif26ldkignpam1"; type = "gem"; }; - version = "3.0.0"; + version = "3.1.0"; }; rack-protection = { dependencies = ["rack"]; @@ -1634,10 +1654,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a12m1mv8dc0g90fs1myvis8vsgr427k1arg1q4a9qlfw6fqyhis"; + sha256 = "1kpm67az1wxlg76h620in2r7agfyhv177ps268j5ggsanzddzih8"; type = "gem"; }; - version = "3.0.5"; + version = "3.0.6"; }; rack-test = { dependencies = ["rack"]; @@ -1645,10 +1665,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rjl709krgf499dhjdapg580l2qaj9d91pwzk8ck8fpnazlx1bdd"; + sha256 = "1ysx29gk9k14a14zsp5a8czys140wacvp91fja8xcja0j1hzqq8c"; type = "gem"; }; - version = "2.0.2"; + version = "2.1.0"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -1678,10 +1698,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "145m778yylgrjl2q7zfkq35l5sibyynlx6pyp176ifm146gbf9wf"; + sha256 = "1j0zi64m9njfgk4xs4invqlimkgiy4fsivfmbpz33bg0w5yyzazi"; type = "gem"; }; - version = "0.8.1"; + version = "1.0.0"; }; rails_multisite = { dependencies = ["activerecord" "railties"]; @@ -1700,10 +1720,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q8as8yq6ni256fc6bmcqmdch1bksbhsg5lmaqmi4bpi33f06g01"; + sha256 = "0w6pib1s0kmfnhjvxwh48flz7w4gy8y961n821w8by7d1g83vjwq"; type = "gem"; }; - version = "7.0.4.1"; + version = "7.0.4.3"; }; rainbow = { groups = ["default" "development" "test"]; @@ -1726,10 +1746,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wb2x51parf6v78w0cic90m33bdc92y5h8rj4wqs75dhw1b69hc7"; + sha256 = "0c27mcglrj928zkm4d2spj9yh2xkkka8ns5s6bidkwild3zvj3ma"; type = "gem"; }; - version = "0.20.0"; + version = "0.20.1"; }; rake = { groups = ["default" "development" "test"]; @@ -1792,10 +1812,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i4a8hxxcxci3n8hhlm9a8wa7a9m58r6sjvh4749v7362i8cy010"; + sha256 = "0fikjg6j12ka6hh36dxzhfkpqqmilzjfzcdf59iwkzsgd63f0ziq"; type = "gem"; }; - version = "4.8.0"; + version = "4.8.1"; }; redis-namespace = { dependencies = ["redis"]; @@ -1813,10 +1833,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zjg29w5zvar7by1kqck3zilbdzm5iz3jp5d1zn3970krskfazh2"; + sha256 = "17xizkw5ryw8hhq64iqxmzdrrdxpc5lhkqc1fgm1aj0zsk1r2950"; type = "gem"; }; - version = "2.6.2"; + version = "2.8.0"; }; request_store = { dependencies = ["rack"]; @@ -1897,10 +1917,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ibb81slc35q5yp276sixp3yrvj9q92wlmi1glbnwlk6g49z8rn4"; + sha256 = "0da45cvllbv39sdbsl65vp5djb2xf5m10mxc9jm7rsqyyxjw4h1f"; type = "gem"; }; - version = "3.12.0"; + version = "3.12.1"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -1930,10 +1950,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sq2cc9pm5gq411y7iwfvzbmgv3g91lyf7y7cqn1lr3yf1v122nc"; + sha256 = "1hfm17xakfvwya236graj6c2arr4sb9zasp35q5fykhyz8mhs0w2"; type = "gem"; }; - version = "3.12.3"; + version = "3.12.5"; }; rspec-rails = { dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; @@ -1978,16 +1998,27 @@ }; version = "2.8.0"; }; + rtlcss = { + dependencies = ["mini_racer"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nnc1qdr4vdr91406ga1nnw5xk27ii2yzk325ixrf2qca3zl213k"; + type = "gem"; + }; + version = "0.2.0"; + }; rubocop = { dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a2j57r6pvngqlzkmww031gs5isax3nsr9n7cbfpqnh34ljh2lk1"; + sha256 = "0l46lw5gfj3mcm982wpmx7br4rs466gyislv0hfwcsk8dxhv1zkw"; type = "gem"; }; - version = "1.44.0"; + version = "1.50.2"; }; rubocop-ast = { dependencies = ["parser"]; @@ -1995,10 +2026,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pdzabz95hv3z5sfbkfqa8bdybsfl13gv7rjb32v3ss8klq99lbd"; + sha256 = "0n2gsafg6p7nr1z8i1hkvp2qqkkbg842ba183dnl0h08xd9ms6q5"; type = "gem"; }; - version = "1.24.1"; + version = "1.28.0"; }; rubocop-capybara = { dependencies = ["rubocop"]; @@ -2006,10 +2037,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h4qcjkz0365qlhi7y1ni94qj14k397cad566zygm20p15ypbp5v"; + sha256 = "1pz52ml0qbxgcjlmp8y0wsq8xy398n6ypkbrwfaa8zb0v7pscj6n"; type = "gem"; }; - version = "2.17.0"; + version = "2.17.1"; }; rubocop-discourse = { dependencies = ["rubocop" "rubocop-rspec"]; @@ -2017,10 +2048,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m6jqyh44vfibqcnxi0xz69xgrbf8vpps90h6al5qdbibm9dmajd"; + sha256 = "1jfpi8wd6gxd626kp27n20ja1yj68478dqbc1fiyzj4mr8nw8nsl"; type = "gem"; }; - version = "3.0.3"; + version = "3.2.0"; }; rubocop-rspec = { dependencies = ["rubocop" "rubocop-capybara"]; @@ -2028,10 +2059,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vmmin3ymgq7bhv2hl4pd0zpwawy709p816axc4vi67w61b4bij1"; + sha256 = "1k8yh0nzlz0g8igmj5smnxq71qmi2b005nkl25wkpjkwvzn2wfdx"; type = "gem"; }; - version = "2.18.1"; + version = "2.19.0"; }; ruby-prof = { groups = ["development"]; @@ -2042,20 +2073,20 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "09n13bzm1p956z318xx1v7ikqdp2i971v7p3kwf3170axz368ccy"; + sha256 = "106i9m62a20xaipp3vsq4rsnggddfgdvb8xqhvi264slvmac85zq"; type = "gem"; }; - version = "1.4.5"; + version = "1.6.1"; }; ruby-progressbar = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; + sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40"; type = "gem"; }; - version = "1.11.0"; + version = "1.13.0"; }; ruby-readability = { dependencies = ["guess_html_encoding" "nokogiri"]; @@ -2094,32 +2125,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zq8pxmsd1abw18zz6mazsm2jfpwmbgdxbpawb7bmwvkb2c5yyc1"; + sha256 = "1ga8yzc9zj45m92ycwnzhzahkwvc3dp3lym5m3f3880hs4jhh7l3"; type = "gem"; }; - version = "6.0.0"; + version = "6.0.1"; }; - sassc = { - dependencies = ["ffi" "rake"]; + sass-embedded = { + dependencies = ["google-protobuf" "rake"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sr4825rlwsrl7xrsm0sgalcpf5zgp4i56dbi3qxfa9lhs8r6zh4"; + sha256 = "1fprlazlld0yr4g8aq9qh4lxjxpvzl2s3fp8f9ydwsrchzj95rbh"; type = "gem"; }; - version = "2.0.1"; - }; - sassc-rails = { - dependencies = ["railties" "sassc" "sprockets" "sprockets-rails" "tilt"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1d9djmwn36a5m8a83bpycs48g8kh1n2xkyvghn7dr6zwh4wdyksz"; - type = "gem"; - }; - version = "2.1.2"; + version = "1.62.0"; }; selenium-webdriver = { dependencies = ["rexml" "rubyzip" "websocket"]; @@ -2127,10 +2147,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dkcyq2hfvf4wdj7q5cqqlka1dw6gz28dckxf4r17jmd53ymwg28"; + sha256 = "1hfaz3srv9c420jkmhr19fmdisnjylwpwyjsr8fsw2ggw35ryhrz"; type = "gem"; }; - version = "4.8.0"; + version = "4.8.6"; }; shoulda-matchers = { dependencies = ["activesupport"]; @@ -2239,10 +2259,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "02r3a3ny27ljj19bzmxscw2vlmk7sw1p4ppbl2i69g17khi0p4sw"; + sha256 = "0bhdgfb0pmw9mav1kw9fn0ka012sa0i3h5ppvqssw5xq48nhxnr8"; type = "gem"; }; - version = "0.2.23"; + version = "0.2.25"; }; syntax_tree = { dependencies = ["prettier_print"]; @@ -2250,10 +2270,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sqjjz3ja2563p4dgw46wfx0knpcp176gfvx8gfmkv8h166qnkqg"; + sha256 = "162m5xhbiq315bncp49ziddws537dv09pqsgrzsrmhhsymhgy0zb"; type = "gem"; }; - version = "5.2.0"; + version = "6.1.1"; }; syntax_tree-disable_ternary = { groups = ["development" "test"]; @@ -2270,10 +2290,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15fcfjplc1zqahrha6rxgwnmjlyp41qkj4369fbxdfp0iaxb15pg"; + sha256 = "09phq7jxfgamv03kjcgibw0f6w3g3mlb9yapji3bxh7cbjvwk2pa"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.1"; }; thor = { groups = ["default" "development" "test"]; @@ -2290,20 +2310,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "186nfbcsk0l4l86gvng1fw6jq6p6s7rc0caxr23b3pnbfb20y63v"; + sha256 = "1qmhi6d9przjzhsyk9g5pq2j75c656msh6xzprqd2mxgphf23jxs"; type = "gem"; }; - version = "2.0.11"; + version = "2.1.0"; }; timeout = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lnh0kr7f43m1cjzc2jvggfsl1rzsaj2rd3pn6vp7mcqliymzaza"; + sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6"; type = "gem"; }; - version = "0.3.1"; + version = "0.3.2"; }; tzinfo = { dependencies = ["concurrent-ruby"]; @@ -2311,10 +2331,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5"; + sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; type = "gem"; }; - version = "2.0.5"; + version = "2.0.6"; + }; + tzinfo-data = { + dependencies = ["tzinfo"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m2d0gpsgqnv29j5h2d6g57g0rayvd460b8s2vjr8sn46bqf89m5"; + type = "gem"; + }; + version = "1.2023.3"; }; uglifier = { dependencies = ["execjs"]; @@ -2390,10 +2421,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11c4n5rri8d45c47krpg76n98mqh36l0kp2qrkb4dxnkp4flay6y"; + sha256 = "1vigw7nfszfqgikr6n574k9bfh0rvs74z8xq46rz2zsm8249l8cc"; type = "gem"; }; - version = "0.12.0"; + version = "0.12.1"; }; uri_template = { groups = ["default"]; @@ -2410,10 +2441,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v2vj7q1rk3wd7hdqa3i1d4hq7sfcgf55qc70g6dsichsbgacb9w"; + sha256 = "1dza601x34ln5yvmyaj42gnbij9pifx12frp5vak6n19q9j941r0"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.2"; }; web-push = { dependencies = ["hkdf" "jwt" "openssl"]; @@ -2468,16 +2499,6 @@ }; version = "1.2.9"; }; - xorcist = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1dbbiy8xlcfvn9ais37xfb5rci4liwakkmxzbkp72wmvlgcrf339"; - type = "gem"; - }; - version = "1.1.3"; - }; xpath = { dependencies = ["nokogiri"]; groups = ["default" "test"]; @@ -2499,14 +2520,24 @@ }; version = "0.1.2"; }; + yard = { + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "013yrnwx1zhzhn1fnc19zck22a1qgimsaglp2iwgf5bz9l8h93js"; + type = "gem"; + }; + version = "0.9.34"; + }; zeitwerk = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv"; + sha256 = "028ld9qmgdllxrl7d0qkl65s58wb1n3gv8yjs28g43a8b1hplxk1"; type = "gem"; }; - version = "2.6.6"; + version = "2.6.7"; }; } diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/sass-embedded-static.patch b/pkgs/servers/web-apps/discourse/rubyEnv/sass-embedded-static.patch new file mode 100644 index 000000000000..af9ada13cbe0 --- /dev/null +++ b/pkgs/servers/web-apps/discourse/rubyEnv/sass-embedded-static.patch @@ -0,0 +1,21 @@ +diff --git a/ext/sass/Rakefile b/ext/sass/Rakefile +index 77ced01..1e60ab0 100644 +--- a/ext/sass/Rakefile ++++ b/ext/sass/Rakefile +@@ -18,15 +18,7 @@ file 'protoc.exe' do |t| + end + + file 'sass_embedded' do |t| +- archive = fetch(ENV.fetch(t.name.upcase) { Configuration.default_sass_embedded }) +- unarchive archive +- rm archive +- +- if ENV.key?('NIX_BINTOOLS') +- sh 'patchelf', +- '--set-interpreter', File.read("#{ENV.fetch('NIX_BINTOOLS')}/nix-support/dynamic-linker").chomp, +- (['sass_embedded/src/dart', 'sass_embedded/dart-sass-embedded'].find { |exe| File.exist?(exe) }) +- end ++ symlink(ENV.fetch(t.name.upcase), 'sass_embedded') + end + + file 'embedded.rb' => %w[sass_embedded] do |t| From 06fa6807d2b0ce2d5d96efdf6f4e5a06f75c6aaf Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Fri, 28 Apr 2023 12:14:58 +0200 Subject: [PATCH 11/33] discourseAllPlugins: update all --- .../plugins/discourse-assign/default.nix | 4 ++-- .../plugins/discourse-calendar/Gemfile.lock | 10 +++++----- .../plugins/discourse-calendar/default.nix | 4 ++-- .../plugins/discourse-calendar/gemset.nix | 16 ++++++++-------- .../plugins/discourse-canned-replies/default.nix | 4 ++-- .../discourse-chat-integration/default.nix | 4 ++-- .../plugins/discourse-data-explorer/default.nix | 4 ++-- .../discourse/plugins/discourse-docs/default.nix | 4 ++-- .../plugins/discourse-github/Gemfile.lock | 4 ++-- .../plugins/discourse-github/default.nix | 4 ++-- .../plugins/discourse-github/gemset.nix | 4 ++-- .../plugins/discourse-ldap-auth/Gemfile.lock | 4 ++-- .../plugins/discourse-ldap-auth/default.nix | 4 ++-- .../plugins/discourse-ldap-auth/gemset.nix | 4 ++-- .../plugins/discourse-openid-connect/default.nix | 4 ++-- .../plugins/discourse-prometheus/Gemfile.lock | 2 +- .../plugins/discourse-prometheus/default.nix | 4 ++-- .../plugins/discourse-reactions/default.nix | 4 ++-- .../plugins/discourse-saved-searches/default.nix | 4 ++-- .../plugins/discourse-solved/default.nix | 4 ++-- .../plugins/discourse-spoiler-alert/default.nix | 4 ++-- .../plugins/discourse-voting/default.nix | 4 ++-- .../plugins/discourse-yearly-review/default.nix | 4 ++-- 23 files changed, 54 insertions(+), 54 deletions(-) diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix index e6c32028f65d..9e859795298e 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-assign"; - rev = "c6e6a883f66670e5cfc1eb973af8ac5b7c20f815"; - sha256 = "sha256-OwNV+ZNogUgd6ZKdXwUqoMqcZKc4jbf276rHIYQzjYc="; + rev = "a655a009fade4671e4a2d38f0a0f7ce89d201d80"; + sha256 = "sha256-HCwId3/7NRuToLFyJrOVaAiSxysB7XNZp9BUndSJzlY="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock index 91e6d08c2717..5c69ae645aa5 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock @@ -1,15 +1,15 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.4.2) + activesupport (7.0.4.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - concurrent-ruby (1.2.0) - i18n (1.12.0) + concurrent-ruby (1.2.2) + i18n (1.13.0) concurrent-ruby (~> 1.0) - minitest (5.17.0) + minitest (5.18.0) rrule (0.4.4) activesupport (>= 2.3) tzinfo (2.0.6) @@ -22,4 +22,4 @@ DEPENDENCIES rrule (= 0.4.4) BUNDLED WITH - 2.4.6 + 2.4.10 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix index 28e1001b7f07..1ec357e301cc 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-calendar"; - rev = "b71d4979370dcbd6f193b2ac5cfa0267f8a19fed"; - sha256 = "sha256-XGybZqoM0nX8acLo3iwo+zD+zA4pz/ekLOnmDRNIVSo="; + rev = "d85e8e288d69788e0c3202bb3dab9c3450a98914"; + sha256 = "sha256-mSn2gGidH4iSZ0fhf3UPh9pwMQurK0YGW2OAtdEWFBQ="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-calendar"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix index d2203b182586..8c06a78e3733 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix @@ -5,20 +5,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dmywys50074vj5rivpx188b00qimlc4jn84xzqlialrgp3ckq5f"; + sha256 = "15m0b1im6i401ab51vzr7f8nk8kys1qa0snnl741y3sir3xd07jp"; type = "gem"; }; - version = "7.0.4.2"; + version = "7.0.4.3"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5"; + sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; type = "gem"; }; - version = "1.2.0"; + version = "1.2.2"; }; i18n = { dependencies = ["concurrent-ruby"]; @@ -26,20 +26,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; + sha256 = "1yk33slipi3i1kydzrrchbi7cgisaxym6pgwlzx7ir8vjk6wl90x"; type = "gem"; }; - version = "1.12.0"; + version = "1.13.0"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0"; + sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06"; type = "gem"; }; - version = "5.17.0"; + version = "5.18.0"; }; rrule = { dependencies = ["activesupport"]; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix index eb3da42373a8..8fb400507d05 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-canned-replies"; - rev = "b30b20d43ba5cbbb1ff1476bb43e97d5b8a807e8"; - sha256 = "sha256-XROYSqGy4Z39VAlMXCbx9d+kivpknN98Kn/HhoC4ndQ="; + rev = "5a2d9a11ef3f07fc781acd83770bafc14eca2c1b"; + sha256 = "sha256-R6CmL1hqqybc/I3oAzr3xZ4WThPWQirMjlXkF82xmIk="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-canned-replies"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix index 41c816249c21..40475dbcfa94 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-chat-integration"; - rev = "0522ad64143c9aedb27e00b642e82cad1273c83b"; - sha256 = "sha256-GsoDVZkmKEX8+HwwQXptmmRuykTDqkbsL4WbFsL/PSo="; + rev = "9647c7afc0df42b8e2b5ae585afaf51f107fa195"; + sha256 = "sha256-lP404OJvEEQVKIQTBMca7zb/YxQ6HXcPG1jMKpEB3iA="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-chat-integration"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix index f80e625147d3..b824a2dec2fb 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-data-explorer"; - rev = "556d12ac507b140d1ed9d307cad58fa8e1d8cfdd"; - sha256 = "sha256-fcO/j506kIydnipx6VsuMkj4Wb2MmPCo3LSrj9Fnczc="; + rev = "f99b3af7ed4a21474f35223e83013ee3e8ad7002"; + sha256 = "sha256-3bBKBSc/+yF9ogNj3J6HXM3ynoAoUZeHhZOOhTfbxDw="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-data-explorer"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix index 154f75965f3f..a60ad45e298f 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-docs"; - rev = "bf1c4574a61b053c136e2b181ba2fedb6c16f838"; - sha256 = "sha256-voo3Q+e/Ud1Hg+SdHlvRsxoacFnPOQXwWu/g6n5cR3Y="; + rev = "0b4d2f3691048b6e0e257a1ac9ed01f66f662ba8"; + sha256 = "sha256-HeIUCTbMNpuo6zeaDClsGrUOz4m0L+4UK7AwPsrKIHY="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock index 6093b573ed54..e63a9486d30f 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.1) + addressable (2.8.4) public_suffix (>= 2.0.2, < 6.0) faraday (2.7.4) faraday-net_http (>= 2.0, < 3.1) @@ -24,4 +24,4 @@ DEPENDENCIES sawyer (= 0.9.2) BUNDLED WITH - 2.4.6 + 2.4.10 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix index 743002c0ec80..e0868aad42ed 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-github"; - rev = "148f28c1089288c9527fab1dcb88f13a5a5b0d10"; - sha256 = "sha256-u91X+YFoKE0lP4RnNWX2XzNrJvlOQPbuZzFqBEVf84w="; + rev = "77e336a1b4ea08e2bb8a010d30146e4844afb3f3"; + sha256 = "sha256-VHuf4ymT+W676RAuA3WPQl9QXLdQz4s8vP9EC8XAwW0="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-github"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix index 8d9cd6e219bf..b25a91671cbd 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; + sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.4"; }; faraday = { dependencies = ["faraday-net_http" "ruby2_keywords"]; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile.lock index c923e26408e0..f131626f7c45 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile.lock @@ -12,7 +12,7 @@ GEM pyu-ruby-sasl (~> 0.0.3.2) rubyntlm (~> 0.3.4) pyu-ruby-sasl (0.0.3.3) - rack (2.2.6.2) + rack (2.2.7) rubyntlm (0.3.4) PLATFORMS @@ -25,4 +25,4 @@ DEPENDENCIES rubyntlm (= 0.3.4) BUNDLED WITH - 2.4.6 + 2.4.10 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix index 0fff98865e32..82f13f0d0d8a 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "jonmbake"; repo = "discourse-ldap-auth"; - rev = "2f7a04b9fbeda0c8ab5c70e9012e4914ede9a707"; - sha256 = "sha256-zBug9PHgvRsdQjvfWE5Bylm+0Ot+jBHFrbux7+Kn72c="; + rev = "edcf06957090e8d978a89fe7b07a6ba56fe35214"; + sha256 = "sha256-VxBBip8QEXDQGDOsU5cXjUZe2HThJn20BPsNr33KhKI="; }; meta = with lib; { homepage = "https://github.com/jonmbake/discourse-ldap-auth"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/gemset.nix index c7a026a0c2db..9df3292f7b82 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/gemset.nix @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb"; + sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk"; type = "gem"; }; - version = "2.2.6.2"; + version = "2.2.7"; }; rubyntlm = { groups = ["default"]; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix index 6fe8171593db..372899afd8e0 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-openid-connect"; - rev = "fd552d5eee75ba5710ce92bcd2fa7457ec98bcab"; - sha256 = "sha256-+58QfVvA6BqI/5AfdI4RiSSMzWHvAJMxPvDS2r5FieU="; + rev = "a16d5edd386f4099064753a4eed72ecb9c1bb1a8"; + sha256 = "sha256-9Fuu/UFmU4Gpkm5cRKOgDK0bt7nD545X18wtue+IrN8="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-openid-connect"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock index d9da3253d0d5..25e4e031c01f 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock @@ -13,4 +13,4 @@ DEPENDENCIES webrick (= 1.7.0) BUNDLED WITH - 2.4.6 + 2.4.10 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix index 8d6ddb4199a4..b5c2ef7c6e84 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix @@ -6,8 +6,8 @@ src = fetchFromGitHub { owner = "discourse"; repo = "discourse-prometheus"; - rev = "78324fbaa8cfa3040ee7e01ac793ad2515b6c004"; - sha256 = "sha256-xzI6gzRztLuEzFHlMi3iXZP9bRRMsRHRQEBrwqyzpdk="; + rev = "802cb5aa89838ecb3078dbe21b70d87b1675d89e"; + sha256 = "sha256-tgujK/k/7l/9dAFna5sfUpgP0PVfjk+aGRbqZ70lmRw="; }; patches = [ diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix index 8cc2f18ef8b4..28505b6f40b5 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-reactions"; - rev = "aba16d53d15ceca9ae18595ae85defbd10fe0256"; - sha256 = "sha256-mGyMQGNa5Q2hMQkdIsa1JArA6cqSK+FmGSDJFZxS/go="; + rev = "01aca15b2774c088f3673118e92e9469f37d2fb6"; + sha256 = "sha256-txQ1G2pBcl4bMBwv3vTs9dwBGKp2uEBvK7BuqQ1O8xg="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-reactions"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix index f2d139abedba..c92e54d4c43d 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-saved-searches"; - rev = "d0b568efe6f829617a5bb85793f0ec1d697f2a96"; - sha256 = "sha256-455ovBExE2+vuZOc0bESAbhtTOXqkMrQ//mVSIitLig="; + rev = "5c6d1b6c186c5c96bb92bd6de62d3bc2da6a5b68"; + sha256 = "sha256-Z9wWwf9gH/Iainxx089J4eT7MpQeHpFXgTU40p/IcYY="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-saved-searches"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix index f71ca930ace5..2e393f5c59c8 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-solved"; - rev = "8580f96fdf64abf8b22fa4b28d67a4cb0d72fc42"; - sha256 = "sha256-YpUybEXQuPeDxxdX9dMNw4h6Mh/zNUaiR3bwzck5Urg="; + rev = "29a991e60f3ca3bb44d382d675e4458794a683f3"; + sha256 = "sha256-6flXuGA7SdIlGLYzyY5AXzQF/cEs39XfeptoBia8SHw="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-solved"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix index 6d386c26248d..c5fa6f823951 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-spoiler-alert"; - rev = "a5fdb9096d638ac4a2a3f8ea6b02b6cb04c667d8"; - sha256 = "sha256-S2Xtd/csB1YI85OA+2UO+OgF5u75Oi2YgIukQNOTQjk="; + rev = "0ee68da1fe1d029685a373df7fc874fcd2e50991"; + sha256 = "sha256-z+0RL7HAJ92TyI1z2DBpirYN7IWzV7iGejs8Howo2+s="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-spoiler-alert"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix index 0acf676855ea..6574cece9505 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-voting"; - rev = "54e134c9b4dfeeb7585ff2c2a782990308733d8b"; - sha256 = "sha256-0V+4G2XxUjL424DChFIFjCKm2zWaTAXOSiB9Ic8/lF0="; + rev = "d9cab9664263e75d46533fb83586ce88cb2b6cfe"; + sha256 = "sha256-cKbsc2ZPXaU4CAzM+oqwbs93l3NMrOGw4IBZLVZIDyw="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-voting"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix index 8dab5b1b3937..fa9158395042 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-yearly-review"; - rev = "cb9a2df92788b0a285a595d4acf1749620f62974"; - sha256 = "sha256-Hu61ULEXUxb/cjH7Z47hpBchyUTkz0QqunWoW8mSVQg="; + rev = "af7e294d04ca7b0c64dd604d19a553500accee51"; + sha256 = "sha256-ioUJqLe/sUDKKa106hGY4OhwOgC+96YFQ4Lqr/CFF7Y="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-yearly-review"; From 11da3298d6b925bf5ad9419a6b740fc1f5cf0908 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 28 Apr 2023 13:43:10 +0200 Subject: [PATCH 12/33] iosevka-comfy: document font families better --- pkgs/data/fonts/iosevka/comfy.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/data/fonts/iosevka/comfy.nix b/pkgs/data/fonts/iosevka/comfy.nix index 8f4e0464032d..40b1df8aab57 100644 --- a/pkgs/data/fonts/iosevka/comfy.nix +++ b/pkgs/data/fonts/iosevka/comfy.nix @@ -2,18 +2,19 @@ let sets = [ - # The compact, sans-serif set: - "comfy" - "comfy-fixed" - "comfy-duo" - # The compact, serif set: - "comfy-motion" - "comfy-motion-fixed" - "comfy-motion-duo" - # The wide, sans-serif set: - "comfy-wide" - "comfy-wide-fixed" - "comfy-wide-duo" + # Family | Shapes | Spacing | Style | Ligatures | + # ------------------------+--------+---------+------------+-----------| + "comfy" # Sans | Compact | Monospaced | Yes | + "comfy-fixed" # Sans | Compact | Monospaced | No | + "comfy-duo" # Sans | Compact | Duospaced | Yes | + # ------------------------+--------+---------+------------+-----------| + "comfy-motion" # Slab | Compact | Monospaced | Yes | + "comfy-motion-fixed" # Slab | Compact | Monospaced | No | + "comfy-motion-duo" # Slab | Compact | Duospaced | Yes | + # ------------------------+--------+---------+------------+-----------| + "comfy-wide" # Sans | Wide | Monospaced | Yes | + "comfy-wide-fixed" # Sans | Wide | Monospaced | No | + "comfy-wide-duo" # Sans | Wide | Duospaced | Yes | ]; version = "1.1.0"; src = fetchFromSourcehut { From 2911c56625a61d4254a996ef286eee0d378baeaf Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 28 Apr 2023 13:43:58 +0200 Subject: [PATCH 13/33] iosevka-comfy: 1.1.0->1.2.0 --- pkgs/data/fonts/iosevka/comfy.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/data/fonts/iosevka/comfy.nix b/pkgs/data/fonts/iosevka/comfy.nix index 40b1df8aab57..d10092f66af2 100644 --- a/pkgs/data/fonts/iosevka/comfy.nix +++ b/pkgs/data/fonts/iosevka/comfy.nix @@ -15,13 +15,17 @@ let "comfy-wide" # Sans | Wide | Monospaced | Yes | "comfy-wide-fixed" # Sans | Wide | Monospaced | No | "comfy-wide-duo" # Sans | Wide | Duospaced | Yes | + # ------------------------+--------+---------+------------+-----------| + "comfy-wide-motion" # Slab | Wide | Monospaced | Yes | + "comfy-wide-motion-fixed" # Slab | Wide | Monospaced | No | + "comfy-wide-motion-duo" # Slab | Wide | Duospaced | Yes | ]; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromSourcehut { owner = "~protesilaos"; repo = "iosevka-comfy"; rev = version; - sha256 = "1h72my1s9pvxww6yijrvhy7hj9dspnshya60i60p1wlzr6d18v3p"; + sha256 = "sha256-gHDERf3eDsb59wz+kGa2wLY7RDRWs2woi5P2rZDYjL0="; }; privateBuildPlan = src.outPath + "/private-build-plans.toml"; makeIosevkaFont = set: @@ -35,11 +39,11 @@ let src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; - rev = "ad1e247a3fb8d2e2561122e8e57dcdc86a23df77"; - hash = "sha256-sfItIMl9HOUykoZPsNKRGKwgkSWvNGUe3czHE8qFG5w="; + rev = "d3b461432137b36922e41322c2e45a2401e727a5"; + hash = "sha256-Sm+eG6ovVLmvKvQFEZblQV3jCLQRrc9Gga3pukwteLE="; }; - npmDepsHash = "sha256-HaO2q1f+hX3LjccuVCQaqQZCdUH9r7+jiFOR+3m8Suw="; + npmDepsHash = "sha256-pikpi9eyo1a+AFLr7BMl1kegy3PgYFjzmE3QJqPXpNM="; meta = with lib; { inherit (src.meta) homepage; From 76abe35ff1aa7c8b320f7c7d21b50e4929e6c5f6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 28 Apr 2023 15:27:12 +0300 Subject: [PATCH 14/33] audacity: 3.3.0 -> 3.3.1 --- pkgs/applications/audio/audacity/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index fcaebc059b1e..a531269bc43c 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -61,13 +61,13 @@ stdenv.mkDerivation rec { pname = "audacity"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "Audacity-${version}"; - hash = "sha256-OQX3YFUdK9TR7ZuN2dZc6ZAWaqfftk5VH0qoOwbTAuM="; + hash = "sha256-4L5ggu1izm9kichZBsJHAFq74q59xWGVYC11gy3K9go="; }; postPatch = '' @@ -150,6 +150,7 @@ stdenv.mkDerivation rec { "-Daudacity_conan_enabled=Off" "-Daudacity_use_ffmpeg=loaded" "-Daudacity_has_vst3=Off" + "-Daudacity_has_crashreports=Off" # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ "-DCMAKE_SKIP_BUILD_RPATH=ON" From 7f170c088aa3d8019e7feb4b46992b77e226ed18 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 28 Apr 2023 10:27:02 -0400 Subject: [PATCH 15/33] nix-update: 0.17.1 -> 0.17.2 Diff: https://github.com/Mic92/nix-update/compare/0.17.1...0.17.2 Changelog: https://github.com/Mic92/nix-update/releases/tag/0.17.2 --- pkgs/tools/package-management/nix-update/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index 6960a7d5806c..81bdca2ed4f3 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-update"; - version = "0.17.1"; + version = "0.17.2"; format = "setuptools"; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - hash = "sha256-nlA9WmwXkx/2IgRCcmoj/kpRNbNVTEl7uSkISXgo8wo="; + hash = "sha256-W2vBKgdPOLGdAIxbHD4Qi4ivAabFSuu7ikvu5kItwN8="; }; makeWrapperArgs = [ From 0f569569375542e31a3a4e9accdbe603d470eea2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 Apr 2023 16:55:47 +0200 Subject: [PATCH 16/33] python310Packages.userpath: update build system - add changelog to meta - disable on unsupported Python releases --- .../python-modules/userpath/default.nix | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/userpath/default.nix b/pkgs/development/python-modules/userpath/default.nix index 636409f1d967..46fc9ab92512 100644 --- a/pkgs/development/python-modules/userpath/default.nix +++ b/pkgs/development/python-modules/userpath/default.nix @@ -1,29 +1,43 @@ { lib , buildPythonPackage , fetchPypi +, hatchling , click +, pythonOlder }: buildPythonPackage rec { pname = "userpath"; - version = "1.7.0"; + version = "1.8.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256="sha256-3NZsX6mxo8EjYvMJu7W8eZK6yK+G0XtOaxpLFmoRxD8="; + hash = "sha256-BCM9L8/lz/kRweT7cYl1VkDhUk/4ekuCq51rh1/uV4c="; }; - propagatedBuildInputs = [ click ]; + nativeBuildInputs = [ + hatchling + ]; - # test suite is difficult to emulate in sandbox due to shell manipulation + propagatedBuildInputs = [ + click + ]; + + # Test suite is difficult to emulate in sandbox due to shell manipulation doCheck = false; - pythonImportsCheck = [ "click" "userpath" ]; + pythonImportsCheck = [ + "userpath" + ]; meta = with lib; { description = "Cross-platform tool for adding locations to the user PATH"; homepage = "https://github.com/ofek/userpath"; - license = [ licenses.asl20 licenses.mit ]; + changelog = "https://github.com/ofek/userpath/releases/tag/v${version}"; + license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ yshym ]; }; } From 0fc5fdce8417e1b530b81cdf8fcdf91ad53a3f0b Mon Sep 17 00:00:00 2001 From: StepBroBD Date: Fri, 28 Apr 2023 12:04:19 -0600 Subject: [PATCH 17/33] raycast: 1.49.3 -> 1.50.0 --- pkgs/os-specific/darwin/raycast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/os-specific/darwin/raycast/default.nix index c75f1827f01c..611c15ad4171 100644 --- a/pkgs/os-specific/darwin/raycast/default.nix +++ b/pkgs/os-specific/darwin/raycast/default.nix @@ -6,7 +6,7 @@ stdenvNoCC.mkDerivation rec { pname = "raycast"; - version = "1.49.3"; + version = "1.50.0"; src = fetchurl { # https://github.com/NixOS/nixpkgs/pull/223495 @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec { # to host GitHub Actions to periodically check for updates # and re-release the `.dmg` file to Internet Archive (https://archive.org/details/raycast) url = "https://archive.org/download/raycast/raycast-${version}.dmg"; - sha256 = "sha256-Irn99/49fRQg73cX8aKZ72D1o+mDPg44Q1pXAMdXrb0="; + sha256 = "sha256-+LvQDQZjbj/p8VT/af9XwKSKkKd65YzcwrKF9hoXCog="; }; dontPatch = true; From 82ef0bb184e99f13bce7cca60e677cd108491b16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 27 Apr 2023 17:15:58 +0200 Subject: [PATCH 18/33] taskjuggler: 3.6.0 -> 3.7.2 Made with `nix-shell maintainers/scripts/update.nix --argstr package taskjuggler`. --- .../misc/taskjuggler/Gemfile.lock | 30 ++++-- pkgs/applications/misc/taskjuggler/gemset.nix | 97 ++++++++++++++++--- 2 files changed, 109 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/misc/taskjuggler/Gemfile.lock b/pkgs/applications/misc/taskjuggler/Gemfile.lock index 0f05c496173f..a2312677be80 100644 --- a/pkgs/applications/misc/taskjuggler/Gemfile.lock +++ b/pkgs/applications/misc/taskjuggler/Gemfile.lock @@ -1,15 +1,31 @@ GEM remote: https://rubygems.org/ specs: - mail (2.7.1) + date (3.3.3) + mail (2.8.1) mini_mime (>= 0.1.1) - mini_mime (1.0.1) - taskjuggler (3.6.0) - mail (>= 2.4.3) - term-ansicolor (>= 1.0.7) + net-imap + net-pop + net-smtp + mini_mime (1.1.2) + net-imap (0.3.4) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.1) + timeout + net-smtp (0.3.3) + net-protocol + sync (0.5.0) + taskjuggler (3.7.2) + mail (~> 2.7, >= 2.7.1) + term-ansicolor (~> 1.7, >= 1.7.1) term-ansicolor (1.7.1) tins (~> 1.0) - tins (1.20.2) + timeout (0.3.2) + tins (1.32.1) + sync PLATFORMS ruby @@ -18,4 +34,4 @@ DEPENDENCIES taskjuggler BUNDLED WITH - 2.1.4 + 2.4.12 diff --git a/pkgs/applications/misc/taskjuggler/gemset.nix b/pkgs/applications/misc/taskjuggler/gemset.nix index c22d49c7dc74..a31d735ac9cf 100644 --- a/pkgs/applications/misc/taskjuggler/gemset.nix +++ b/pkgs/applications/misc/taskjuggler/gemset.nix @@ -1,24 +1,88 @@ { - mail = { - dependencies = ["mini_mime"]; + date = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; + sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; type = "gem"; }; - version = "2.7.1"; + version = "3.3.3"; + }; + mail = { + dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc"; + type = "gem"; + }; + version = "2.8.1"; }; mini_mime = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3"; + sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.2"; + }; + net-imap = { + dependencies = ["date" "net-protocol"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8"; + type = "gem"; + }; + version = "0.3.4"; + }; + net-pop = { + dependencies = ["net-protocol"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wyz41jd4zpjn0v1xsf9j778qx1vfrl24yc20cpmph8k42c4x2w4"; + type = "gem"; + }; + version = "0.1.2"; + }; + net-protocol = { + dependencies = ["timeout"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91"; + type = "gem"; + }; + version = "0.2.1"; + }; + net-smtp = { + dependencies = ["net-protocol"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; + type = "gem"; + }; + version = "0.3.3"; + }; + sync = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1z9qlq4icyiv3hz1znvsq1wz2ccqjb1zwd6gkvnwg6n50z65d0v6"; + type = "gem"; + }; + version = "0.5.0"; }; taskjuggler = { dependencies = ["mail" "term-ansicolor"]; @@ -26,10 +90,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ky3cydl3szhdyxsy4k6zxzjlbll7mlq025aj6xd5jmh49k3pfbp"; + sha256 = "07fagka8nl29xwwzfhxx89gp34m5hih5vnq4sha1z814004md53j"; type = "gem"; }; - version = "3.6.0"; + version = "3.7.2"; }; term-ansicolor = { dependencies = ["tins"]; @@ -42,14 +106,25 @@ }; version = "1.7.1"; }; - tins = { + timeout = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pqj45n216zrz7yckdbdknlmhh187iqzx8fp76y2h0jrgqjfkxmj"; + sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6"; type = "gem"; }; - version = "1.20.2"; + version = "0.3.2"; + }; + tins = { + dependencies = ["sync"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0373zn7zkllcn2q4ylbjgjx9mvm8m73ll3jwjav48dx8myplsp5p"; + type = "gem"; + }; + version = "1.32.1"; }; } From e24518ef5910fe0bea06c13ffa8507bbd71dba89 Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Fri, 28 Apr 2023 20:21:13 +0200 Subject: [PATCH 19/33] jetbrains: 2023.1 -> 2023.1.2 --- .../editors/jetbrains/versions.json | 144 +++++++++--------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json index 60a3249a2b61..6167c6134c9f 100644 --- a/pkgs/applications/editors/jetbrains/versions.json +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -3,10 +3,10 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2023.1.1", - "sha256": "19f2f435ff21453f724e16b318a94d19c414fd5863aa08cc73e78c85a20d73c5", - "url": "https://download.jetbrains.com/cpp/CLion-2023.1.1.tar.gz", - "build_number": "231.8109.222" + "version": "2023.1.2", + "sha256": "e3efc51a4431dc67da6463a8a37aab8ad6a214a8338430ae61cd4add5e7e5b04", + "url": "https://download.jetbrains.com/cpp/CLion-2023.1.2.tar.gz", + "build_number": "231.8770.66" }, "datagrip": { "update-channel": "DataGrip RELEASE", @@ -35,18 +35,18 @@ "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2023.1", - "sha256": "e6fe45c9df8e763ee3278444b5fb1003910c436752e83221e0303a62c5e81eaa", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.1.tar.gz", - "build_number": "231.8109.175" + "version": "2023.1.1", + "sha256": "0a9bc55c2eaecbe983cd1db9ab6a353e3b7c3747f6fc6dea95736df104a68239", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.1.1.tar.gz", + "build_number": "231.8770.65" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2023.1", - "sha256": "3029c751c36d86fef0021feceb8f3010d37aebd42aef6d6aed9e3b9207c2d2ac", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.1.tar.gz", - "build_number": "231.8109.175" + "version": "2023.1.1", + "sha256": "62ac9a6a801e5e029c3ca5ea28ee5de2680e3d58ae233cf1cb3d3636c6b205ca", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.1.1.tar.gz", + "build_number": "231.8770.65" }, "mps": { "update-channel": "MPS RELEASE", @@ -84,36 +84,36 @@ "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2023.1", - "sha256": "494cd8bbb41023ae4a53487e9ac46aacc68f52ee3e14c8621f49e2675d56fa9c", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.tar.gz", - "build_number": "231.8109.212" + "version": "2023.1.1", + "sha256": "d50a7ed977e04ae50d6a16422a0968896fc6d94b0ab84d044ad3503d904570e0", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.1.tar.gz", + "build_number": "231.8770.54" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2023.1", - "sha256": "f9eabc980d82a9c9b27bc84daa7f1e786f41b17bbbfeca282985c6ed87e768ec", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.tar.gz", - "build_number": "231.8109.174" + "version": "2023.1.1", + "sha256": "44a852fa872751ba53b1a10eb5d136a407ae7db90e4e4f8c37ba282dcc9c1419", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.1.tar.gz", + "build_number": "231.8770.57" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2023.1", - "sha256": "bd074c7bafdcfcce4db001a4356040d0badd7cd2f65418a35b4156b00a07e94b", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.tar.gz", - "build_number": "231.8109.174" + "version": "2023.1.1", + "sha256": "93e11177010037a156939f2ded59ac5d8d0661e47a4471399665affe4a1eb7a9", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.1.tar.gz", + "build_number": "231.8770.64" } }, "x86_64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2023.1.1", - "sha256": "98e1d907604dcde89b2a5df6a8331894eab03f1fb72e6acbde7da5c279f0043e", - "url": "https://download.jetbrains.com/cpp/CLion-2023.1.1.dmg", - "build_number": "231.8109.222" + "version": "2023.1.2", + "sha256": "a980ecceda348d5a9e4ee7aaec2baf6d985a66c714ee270d402d708838e40d26", + "url": "https://download.jetbrains.com/cpp/CLion-2023.1.2.dmg", + "build_number": "231.8770.66" }, "datagrip": { "update-channel": "DataGrip RELEASE", @@ -142,18 +142,18 @@ "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2023.1", - "sha256": "233cc0253921bb002bd20eff0e493864b5b7ad951cd806d29a702cf1a6934f0f", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.1.dmg", - "build_number": "231.8109.175" + "version": "2023.1.1", + "sha256": "ee7769737cb0e22d4c88ea8808d0767b8d88667b6b732748d745a5eb48809c46", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.1.1.dmg", + "build_number": "231.8770.65" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2023.1", - "sha256": "1e8498336a5c4d90518f47d687a167adbe0e634d1f7d10530164c84542b91677", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.1.dmg", - "build_number": "231.8109.175" + "version": "2023.1.1", + "sha256": "46fed7185c1cc901778593941db035d9806ebdad930eccbb4472668d440e60af", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.1.1.dmg", + "build_number": "231.8770.65" }, "mps": { "update-channel": "MPS RELEASE", @@ -191,36 +191,36 @@ "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2023.1", - "sha256": "fe6ee0086b3e59eecc7e2816e8f803a702a6b7ea382cb0a2168d08d19dd656d7", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.dmg", - "build_number": "231.8109.212" + "version": "2023.1.1", + "sha256": "72131efb1d4606cefd9bfb11cc98443a13f5b9761ac007484564db2107e7f8e9", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.1.dmg", + "build_number": "231.8770.54" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2023.1", - "sha256": "fba60e34520c807ba0a9124802e5782e2b4c8e63c27e07968b9cb642f0fc0a77", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.dmg", - "build_number": "231.8109.174" + "version": "2023.1.1", + "sha256": "2c37a3e8c8a9b800b9132f31d0cfdffbb3fd4ee83de13b3141187ec05a79e3e0", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.1.dmg", + "build_number": "231.8770.57" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2023.1", - "sha256": "35f110baf5a37232175a367c524a4cb04216bc2c0b0767506449648df6a12032", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.dmg", - "build_number": "231.8109.174" + "version": "2023.1.1", + "sha256": "e7b9b86501682a0cf5a1b2d22e65491a6923635043378707581357a10fc8dc2a", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.1.dmg", + "build_number": "231.8770.64" } }, "aarch64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2023.1.1", - "sha256": "f18183aa0efd776f2d641c72e61892e2d987f4b1f2a59786b2afb12604c43658", - "url": "https://download.jetbrains.com/cpp/CLion-2023.1.1-aarch64.dmg", - "build_number": "231.8109.222" + "version": "2023.1.2", + "sha256": "61c8c1e76fe25389557111534c3fdadb5ba69427384890bf25499d0b474c147d", + "url": "https://download.jetbrains.com/cpp/CLion-2023.1.2-aarch64.dmg", + "build_number": "231.8770.66" }, "datagrip": { "update-channel": "DataGrip RELEASE", @@ -249,18 +249,18 @@ "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2023.1", - "sha256": "33964525cb28ac199e39e3c8eac4128874963f3292d5074257ae54fe1df9f986", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.1-aarch64.dmg", - "build_number": "231.8109.175" + "version": "2023.1.1", + "sha256": "c9ab2053e1ad648466c547c378bd4e8753b4db8908de1caaeca91563ad80f6f9", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.1.1-aarch64.dmg", + "build_number": "231.8770.65" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2023.1", - "sha256": "6e2ca530fe082f79724fb89849e06fa91b8c17089430f9633a7e9a813204151f", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.1-aarch64.dmg", - "build_number": "231.8109.175" + "version": "2023.1.1", + "sha256": "ae631000e19b821194b38be7caaa1e13ad78b465e6eb00f44215bb1173038448", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.1.1-aarch64.dmg", + "build_number": "231.8770.65" }, "mps": { "update-channel": "MPS RELEASE", @@ -298,26 +298,26 @@ "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2023.1", - "sha256": "dbd708379f2a489add7e87a321297841baf8bfcf83ce2f5549a1ff9f5037cf46", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1-aarch64.dmg", - "build_number": "231.8109.212" + "version": "2023.1.1", + "sha256": "b089e107bd81829fffe97509912c4467f8b4ea09fd5f38ebd8cc8c57e6adb947", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.1-aarch64.dmg", + "build_number": "231.8770.54" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2023.1", - "sha256": "56d0202ea1261eb8ac5bd24f1cb044282cda5bd6c8306d3ec606109a3fe28fba", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.1-aarch64.dmg", - "build_number": "231.8109.174" + "version": "2023.1.1", + "sha256": "17327de2d4edd3fbddb47c96d4db1bfba716786eb5b74b4a2e3ba6d0482610f9", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.1-aarch64.dmg", + "build_number": "231.8770.57" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2023.1", - "sha256": "91f4a8f63c36407e9431a97a1ecc33762f67afd488046796cf4cca3a6709518c", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1-aarch64.dmg", - "build_number": "231.8109.174" + "version": "2023.1.1", + "sha256": "3ccf935b898511106b25f3d30363767372f6a301311a5547f68210895b054cf1", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.1-aarch64.dmg", + "build_number": "231.8770.64" } } } From 365041415b7c2b9a16cc753096da4d9e46f85d8d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 28 Apr 2023 16:28:46 +0200 Subject: [PATCH 20/33] buildMozillaMach: Apply musl compat patch up to 114.0 A slightly modified version landed in 114.0a1. Related: mozbz#1830040 --- pkgs/applications/networking/browsers/firefox/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 46d99f9c5a6b..8cac0d6fe13b 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -230,8 +230,9 @@ buildStdenv.mkDerivation ({ url = "https://hg.mozilla.org/mozilla-central/raw-rev/1068e0955cfb"; hash = "sha256-iPqmofsmgvlFNm+mqVPbdgMKmP68ANuzYu+PzfCpoNA="; }) - ] ++ [ + ] ++ lib.optionals (lib.versionOlder version "114.0") [ # https://bugzilla.mozilla.org/show_bug.cgi?id=1830040 + # https://hg.mozilla.org/mozilla-central/rev/cddb250a28d8 (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/community/firefox/avoid-redefinition.patch?id=2f620d205ed0f9072bbd7714b5ec1b7bf6911c12"; hash = "sha256-fLUYaJwhrC/wF24HkuWn2PHqz7LlAaIZ1HYjRDB2w9A="; From a38198b2997322121ad5890ac6734a14671359de Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 28 Apr 2023 21:50:23 +0300 Subject: [PATCH 21/33] tempo: 2.1.0 -> 2.1.1 Diff: https://github.com/grafana/tempo/compare/v2.1.0...v2.1.1 --- pkgs/servers/tracing/tempo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tracing/tempo/default.nix b/pkgs/servers/tracing/tempo/default.nix index 73576432e2e8..95ed1bf753ad 100644 --- a/pkgs/servers/tracing/tempo/default.nix +++ b/pkgs/servers/tracing/tempo/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "tempo"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "grafana"; repo = "tempo"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-fhRIr9dFcfD3hFw6fnrV4yWEcz+CB5xph3KpxnKEWis="; + sha256 = "sha256-gnQAldqfxJk8kbXAyX1VQXddCnSBWnvc3wesYoYI7wI="; }; vendorSha256 = null; From 741eb276a87d3d5681e2a3cba22443a82043dbba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Apr 2023 19:13:00 +0000 Subject: [PATCH 22/33] php80Extensions.swoole: 5.0.1 -> 5.0.3 --- pkgs/development/php-packages/swoole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/swoole/default.nix b/pkgs/development/php-packages/swoole/default.nix index bd62e06233a8..fa739f16a97d 100644 --- a/pkgs/development/php-packages/swoole/default.nix +++ b/pkgs/development/php-packages/swoole/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildPecl, php, valgrind, pcre2, fetchFromGitHub }: let - version = "5.0.1"; + version = "5.0.3"; in buildPecl { inherit version; pname = "swoole"; @@ -10,7 +10,7 @@ in buildPecl { owner = "swoole"; repo = "swoole-src"; rev = "v${version}"; - sha256 = "sha256-d0xccbfOmebWR14oTUviWz/mB5IA7iXn0uUWxTQRd9w="; + sha256 = "sha256-xadseYMbA+llzTf9JFIitJK2iR0dN8vAjv3n9/e7FGs="; }; buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; From ab4d4f6fd55a2d17f3bd125ed08de2564525ea2d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 28 Apr 2023 22:25:30 +0300 Subject: [PATCH 23/33] jprofiler: darwin: 11.1.4 -> 13.0.2 --- .../tools/java/jprofiler/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/java/jprofiler/default.nix b/pkgs/development/tools/java/jprofiler/default.nix index e6f0232fe681..f4c5df10386e 100644 --- a/pkgs/development/tools/java/jprofiler/default.nix +++ b/pkgs/development/tools/java/jprofiler/default.nix @@ -4,7 +4,7 @@ , makeWrapper , makeDesktopItem , copyDesktopItems -, undmg +, _7zz , jdk }: @@ -12,9 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "jprofiler"; - # 11.1.4 is the last version which can be unpacked by undmg - # See: https://github.com/matthewbauer/undmg/issues/9 - version = if stdenv.isLinux then "13.0.2" else "11.1.4"; + version = "13.0.2"; nameApp = "JProfiler"; meta = with lib; { @@ -33,7 +31,7 @@ let sha256 = "sha256-x9I7l2ctquCqUymtlQpFXE6+u0Yg773qE6MvAxvCaEE="; } else fetchurl { url = "https://download-gcdn.ej-technologies.com/jprofiler/jprofiler_macos_${lib.replaceStrings ["."] ["_"] version}.dmg"; - sha256 = "sha256-WDMGrDsMdY1//WMHgr+/YKSxHWt6A1dD1Pd/MuDOaz8="; + sha256 = "sha256-CpuFmvszMZA1+1A51swWA3maK8I8RQEYo8Z3A/CQSlA="; }; srcIcon = fetchurl { @@ -80,15 +78,20 @@ let darwin = stdenv.mkDerivation { inherit pname version src; - # Archive extraction via undmg fails for this particular version. - nativeBuildInputs = [ makeWrapper undmg ]; + nativeBuildInputs = [ makeWrapper _7zz ]; - sourceRoot = "${nameApp}.app"; + unpackPhase = '' + runHook preUnpack + 7zz x $src -x!JProfiler/\[\] + runHook postUnpack + ''; + + sourceRoot = "${nameApp}"; installPhase = '' runHook preInstall - mkdir -p $out/{Applications/${nameApp}.app,bin} - cp -R . $out/Applications/${nameApp}.app + mkdir -p $out/{Applications,bin} + cp -R ${nameApp}.app $out/Applications/ makeWrapper $out/Applications/${nameApp}.app/Contents/MacOS/JavaApplicationStub $out/bin/${pname} runHook postInstall ''; From e827e6e7b4d4b872cd628eca972940ac5b7c8160 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 28 Apr 2023 22:36:33 +0300 Subject: [PATCH 24/33] jprofiler: 13.0.2 -> 13.0.6 --- pkgs/development/tools/java/jprofiler/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/java/jprofiler/default.nix b/pkgs/development/tools/java/jprofiler/default.nix index f4c5df10386e..2044771fa9b3 100644 --- a/pkgs/development/tools/java/jprofiler/default.nix +++ b/pkgs/development/tools/java/jprofiler/default.nix @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "jprofiler"; - version = "13.0.2"; + version = "13.0.6"; nameApp = "JProfiler"; meta = with lib; { @@ -28,15 +28,15 @@ let src = if stdenv.isLinux then fetchurl { url = "https://download-gcdn.ej-technologies.com/jprofiler/jprofiler_linux_${lib.replaceStrings ["."] ["_"] version}.tar.gz"; - sha256 = "sha256-x9I7l2ctquCqUymtlQpFXE6+u0Yg773qE6MvAxvCaEE="; + hash = "sha256-orjBSaC7NvKcak+RSEa9V05oL3EZIBnp7TyaX/8XFyg="; } else fetchurl { url = "https://download-gcdn.ej-technologies.com/jprofiler/jprofiler_macos_${lib.replaceStrings ["."] ["_"] version}.dmg"; - sha256 = "sha256-CpuFmvszMZA1+1A51swWA3maK8I8RQEYo8Z3A/CQSlA="; + hash = "sha256-OI6NSPqYws5Rv25U5jIPzkyJtB8LF04qHB3NPR9XBWg="; }; srcIcon = fetchurl { url = "https://www.ej-technologies.com/assets/content/header-product-jprofiler@2x-24bc4d84bd2a4eb641a5c8531758ff7c.png"; - sha256 = "sha256-XUmuqhnNv7mZ3Gb4A0HLSlfiJd5xbCExVsw3hmXHeVE="; + hash = "sha256-XUmuqhnNv7mZ3Gb4A0HLSlfiJd5xbCExVsw3hmXHeVE="; }; desktopItems = makeDesktopItem { From d5edd07a01397450e9faebf6a68adb01330364fa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 28 Apr 2023 21:07:40 +0200 Subject: [PATCH 25/33] python310Packages.aioesphomeapi: Propagate protobuf dev output Required for aioesphomeapi to be usable in makePythonPath. --- pkgs/development/python-modules/aioesphomeapi/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index bee7cc393321..d9f02f883e34 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -28,7 +28,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ async-timeout noiseprotocol - protobuf + protobuf.out + protobuf.dev zeroconf ]; From 9ebb469697abcbae1b8b91275e62a6ddc7932682 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 28 Apr 2023 21:36:30 +0200 Subject: [PATCH 26/33] nixosTests.home-assistant: Test more components --- nixos/tests/home-assistant.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 8585cb3585fe..22a63cc73664 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -61,6 +61,13 @@ in { # https://www.home-assistant.io/integrations/frontend/ frontend = {}; + # include some popular integrations, that absolutely shouldn't break + esphome = {}; + knx = {}; + matter = {}; + shelly = {}; + zha = {}; + # set up a wake-on-lan switch to test capset capability required # for the ping suid wrapper # https://www.home-assistant.io/integrations/wake_on_lan/ @@ -107,7 +114,7 @@ in { # Cause a configuration change that requires a service restart as we added a new runtime dependency specialisation.newFeature = { inheritParentConfig = true; - configuration.services.home-assistant.config.esphome = {}; + configuration.services.home-assistant.config.backup = {}; }; }; From 23caee0f0a039df46f88c869d6f2b3bd12b00b02 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 29 Apr 2023 03:42:59 +0800 Subject: [PATCH 27/33] chromium: fix gtk4 schema paths --- pkgs/applications/networking/browsers/chromium/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 202b0cab0e31..47b768cfb307 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -166,7 +166,7 @@ in stdenv.mkDerivation { buildInputs = [ # needed for GSETTINGS_SCHEMAS_PATH - gsettings-desktop-schemas glib gtk3 + gsettings-desktop-schemas glib gtk3 gtk4 # needed for XDG_ICON_DIRS gnome.adwaita-icon-theme From dc97d2c2641b5491da4f34dd55683787ec8e0152 Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Sun, 23 Apr 2023 14:29:19 +0200 Subject: [PATCH 28/33] googleearth-pro: Avoid dragging in stdenv I noticed that my system closure contained duplicate of various packages, and traced it back to `googleearth-pro`. It included a `env-vars` file created by `stdenv` which pulled in lots of build tools, and it seems it was copied in `installPhase` by accident. By only copying the directories from the upstream package, the number of paths in the closure is reduced noticably: ```diff ~/build/nixpkgs $ diff -u <(nix-store --query -R result-before|wc -l) <(nix-store --query -R result|wc -l) --- /dev/fd/63 2023-04-23 14:31:22.653577750 +0200 +++ /dev/fd/62 2023-04-23 14:31:22.654577714 +0200 @@ -1 +1 @@ -396 +256 $ du -sch $(nix-store -qR result-before) | grep total 1.5G total $ du -sch $(nix-store -qR result) | grep total 894M total ``` --- pkgs/applications/misc/googleearth-pro/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/googleearth-pro/default.nix b/pkgs/applications/misc/googleearth-pro/default.nix index dd6964318e77..59912ef6b1ac 100644 --- a/pkgs/applications/misc/googleearth-pro/default.nix +++ b/pkgs/applications/misc/googleearth-pro/default.nix @@ -71,16 +71,17 @@ mkDerivation rec { unpackPhase = '' # deb file contains a setuid binary, so 'dpkg -x' doesn't work here - dpkg --fsys-tarfile ${src} | tar --extract + mkdir deb + dpkg --fsys-tarfile ${src} | tar --extract -C deb ''; installPhase ='' runHook preInstall mkdir $out - mv usr/* $out/ - rmdir usr - mv * $out/ + mv deb/usr/* $out/ + rmdir deb/usr + mv deb/* $out/ rm $out/bin/google-earth-pro $out/opt/google/earth/pro/googleearth # patch and link googleearth binary From 3c2a276f555bd592f92ade31412e1970481faa44 Mon Sep 17 00:00:00 2001 From: Maxim Ianoglo Date: Sat, 29 Apr 2023 00:05:26 +0300 Subject: [PATCH 29/33] mysql-workbench: 8.0.32 -> 8.0.33 * Bump antlr dependency version: 4.11.x -> 4.12.0 * Bump Java dependency version: jre8 -> openjdk19 * Remove gdal patch as it is not needed anymore --- .../misc/mysql-workbench/default.nix | 18 ++++--- .../mysql-workbench/fix-gdal-includes.patch | 47 ------------------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 9 insertions(+), 58 deletions(-) delete mode 100644 pkgs/applications/misc/mysql-workbench/fix-gdal-includes.patch diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index b4c169b36d8b..468818e4f872 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -9,7 +9,7 @@ , gtkmm3 , pcre , swig -, antlr4_9 +, antlr4_12 , sudo , mysql , libxml2 @@ -46,16 +46,14 @@ let inherit (python3.pkgs) paramiko pycairo pyodbc; in stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "8.0.32"; + version = "8.0.33"; src = fetchurl { - url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; - sha256 = "sha256-ruGdYTG0KPhRnUdlfaZjt1r/tAhA1XeAtjDgu/K9okI="; + url = "https://cdn.mysql.com//Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; + sha256 = "a6c9b05ee6f8accd45203d8234a43415da65ddc8118d427dd1a2ef2a209261bc"; }; patches = [ - ./fix-gdal-includes.patch - (substituteAll { src = ./hardcode-paths.patch; catchsegv = "${glibc.bin}/bin/catchsegv"; @@ -79,11 +77,11 @@ in stdenv.mkDerivation rec { }) ]; - # 1. have it look for 4.9.3 instead of 4.9.1 + # 1. have it look for 4.12.0 instead of 4.11.1 # 2. for some reason CMakeCache.txt is part of source code preConfigure = '' substituteInPlace CMakeLists.txt \ - --replace "antlr-4.9.1-complete.jar" "antlr-4.9.3-complete.jar" + --replace "antlr-4.11.1-complete.jar" "antlr-4.12.0-complete.jar" rm -f build/CMakeCache.txt ''; @@ -100,7 +98,7 @@ in stdenv.mkDerivation rec { gtk3 gtkmm3 libX11 - antlr4_9.runtime.cpp + antlr4_12.runtime.cpp python3 mysql libxml2 @@ -157,7 +155,7 @@ in stdenv.mkDerivation rec { # mysql-workbench 8.0.21 depends on libmysqlconnectorcpp 1.1.8. # Newer versions of connector still provide the legacy library when enabled # but the headers are in a different location. - "-DWITH_ANTLR_JAR=${antlr4_9.jarLocation}" + "-DWITH_ANTLR_JAR=${antlr4_12.jarLocation}" "-DMySQLCppConn_INCLUDE_DIR=${libmysqlconnectorcpp}/include/jdbc" ]; diff --git a/pkgs/applications/misc/mysql-workbench/fix-gdal-includes.patch b/pkgs/applications/misc/mysql-workbench/fix-gdal-includes.patch deleted file mode 100644 index 0a5c31fd40a2..000000000000 --- a/pkgs/applications/misc/mysql-workbench/fix-gdal-includes.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/backend/wbpublic/grt/spatial_handler.h -+++ b/backend/wbpublic/grt/spatial_handler.h -@@ -24,12 +24,12 @@ - #ifndef SPATIAL_HANDLER_H_ - #define SPATIAL_HANDLER_H_ - --#include --#include --#include --#include --#include --#include -+#include -+#include -+#include -+#include -+#include -+#include - #include - #include "base/geometry.h" - #include "wbpublic_public_interface.h" ---- a/backend/wbpublic/grtui/geom_draw_box.h -+++ b/backend/wbpublic/grtui/geom_draw_box.h -@@ -25,7 +25,7 @@ - #define _GEOM_DRAW_BOX_H_ - - #include --#include -+#include - #include "wbpublic_public_interface.h" - - class WBPUBLICBACKEND_PUBLIC_FUNC GeomDrawBox : public mforms::DrawBox { ---- a/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp -+++ b/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp -@@ -21,9 +21,9 @@ - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - --#include --#include --#include -+#include -+#include -+#include - - #include - #include diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c01724ec2ea5..013f7bda2c86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39015,7 +39015,7 @@ with pkgs; }; mysql = mysql; pcre = pcre-cpp; - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jre = openjdk19; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }); r128gain = callPackage ../applications/audio/r128gain { }; From c3f48fc86fe7f422ac56c37e3695f3e778016df7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 Apr 2023 23:30:00 +0200 Subject: [PATCH 30/33] python310Packages.pymilvus: add changelog to meta --- pkgs/development/python-modules/pymilvus/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pymilvus/default.nix b/pkgs/development/python-modules/pymilvus/default.nix index ec1095ff69f7..b137a4d1796f 100644 --- a/pkgs/development/python-modules/pymilvus/default.nix +++ b/pkgs/development/python-modules/pymilvus/default.nix @@ -9,6 +9,7 @@ , mmh3 , setuptools-scm }: + buildPythonPackage rec { pname = "pymilvus"; version = "2.2.6"; @@ -26,14 +27,17 @@ buildPythonPackage rec { ujson pandas mmh3 - ] ++ lib.optionals stdenv.isLinux [ setuptools-scm ]; + ] ++ lib.optionals stdenv.isLinux [ + setuptools-scm + ]; doCheck = false; meta = with lib; { + description = "Python SDK for Milvus"; homepage = "https://github.com/milvus-io/pymilvus"; - description = "Python SDK for Milvus. "; + changelog = "https://github.com/milvus-io/pymilvus/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [happysalada]; + maintainers = with maintainers; [ happysalada ]; }; } From 3317543699a82f442800fbaca45bf68d43f0aa04 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 Apr 2023 23:51:43 +0200 Subject: [PATCH 31/33] python310Packages.grpcio-testing: init at 1.54.0 --- .../python-modules/grpcio-testing/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/grpcio-testing/default.nix diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix new file mode 100644 index 000000000000..7aaadfa409e0 --- /dev/null +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, grpcio +, protobuf +, pythonOlder +, pythonRelaxDepsHook +}: + +buildPythonPackage rec { + pname = "grpcio-testing"; + version = "1.54.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-/0LlPGUVhV7lh4RDQH7wImxaynN2wDLoELxoUUG8bpM="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "'grpcio>={version}'.format(version=grpc_version.VERSION)" "'grpcio'" + ''; + + propagatedBuildInputs = [ + grpcio + protobuf + ]; + + pythonImportsCheck = [ + "grpc_testing" + ]; + + # Module has no tests + doCheck = false; + + meta = with lib; { + description = "Testing utilities for gRPC Python"; + homepage = "https://grpc.io/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b3a863b36b68..76448aad835b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4268,6 +4268,8 @@ self: super: with self; { grpcio-tools = callPackage ../development/python-modules/grpcio-tools { }; + grpcio-testing = callPackage ../development/python-modules/grpcio-testing { }; + grpclib = callPackage ../development/python-modules/grpclib { }; gruut = callPackage ../development/python-modules/gruut { }; From 6af56a90ad5ac336eeeb67240b3f4974dec9ed54 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 Apr 2023 23:59:22 +0200 Subject: [PATCH 32/33] python310Packages.pymilvus: 2.2.6 -> 2.2.8 Diff: https://github.com/milvus-io/pymilvus/compare/refs/tags/v2.2.6...v2.2.8 Changelog: https://github.com/milvus-io/pymilvus/releases/tag/v2.2.8 --- .../python-modules/pymilvus/default.nix | 63 ++++++++++++++----- 1 file changed, 46 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/pymilvus/default.nix b/pkgs/development/python-modules/pymilvus/default.nix index b137a4d1796f..983cc7566df6 100644 --- a/pkgs/development/python-modules/pymilvus/default.nix +++ b/pkgs/development/python-modules/pymilvus/default.nix @@ -1,37 +1,66 @@ { lib -, stdenv , buildPythonPackage -, fetchPypi -, grpcio-tools -, ujson +, environs +, fetchFromGitHub , grpcio -, pandas +, grpcio-testing , mmh3 +, pandas +, pytestCheckHook +, python +, pythonOlder +, pythonRelaxDepsHook +, scikit-learn , setuptools-scm +, ujson }: buildPythonPackage rec { pname = "pymilvus"; - version = "2.2.6"; + version = "2.2.8"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-/i3WObwoY6Ffqw+Guij6+uGbKYKET2AJ+d708efmSx0="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "milvus-io"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-Oqwa/2UT9jyGaEEzjr/phZZStLOZ6JRj+4ck0tmP0W0="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ - grpcio - grpcio-tools - ujson - pandas - mmh3 - ] ++ lib.optionals stdenv.isLinux [ + pythonRelaxDeps = [ + "grpcio" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook setuptools-scm ]; - doCheck = false; + propagatedBuildInputs = [ + environs + grpcio + mmh3 + pandas + ujson + ]; + + nativeCheckInputs = [ + grpcio-testing + pytestCheckHook + scikit-learn + ]; + + pythonImportsCheck = [ + "pymilvus" + ]; + + disabledTests = [ + "test_get_commit" + ]; meta = with lib; { description = "Python SDK for Milvus"; From 2909d9b11778ee01908656f63398aa5b9831bc27 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 23 Apr 2023 19:53:51 -0400 Subject: [PATCH 33/33] vector: 0.28.1 -> 0.29.1 --- nixos/modules/services/logging/vector.nix | 11 +- pkgs/tools/misc/vector/Cargo.lock | 2060 ++++++++++++--------- pkgs/tools/misc/vector/default.nix | 15 +- 3 files changed, 1180 insertions(+), 906 deletions(-) diff --git a/nixos/modules/services/logging/vector.nix b/nixos/modules/services/logging/vector.nix index 1803ea85e49c..a923373d1861 100644 --- a/nixos/modules/services/logging/vector.nix +++ b/nixos/modules/services/logging/vector.nix @@ -26,13 +26,9 @@ in }; config = mkIf cfg.enable { + # for cli usage + environment.systemPackages = [ pkgs.vector ]; - users.groups.vector = { }; - users.users.vector = { - description = "Vector service user"; - group = "vector"; - isSystemUser = true; - }; systemd.services.vector = { description = "Vector event and log aggregator"; wantedBy = [ "multi-user.target" ]; @@ -52,8 +48,7 @@ in in { ExecStart = "${pkgs.vector}/bin/vector --config ${validateConfig conf}"; - User = "vector"; - Group = "vector"; + DynamicUser = true; Restart = "no"; StateDirectory = "vector"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; diff --git a/pkgs/tools/misc/vector/Cargo.lock b/pkgs/tools/misc/vector/Cargo.lock index d9f0f72a50e7..f34bceb2093e 100644 --- a/pkgs/tools/misc/vector/Cargo.lock +++ b/pkgs/tools/misc/vector/Cargo.lock @@ -146,10 +146,16 @@ dependencies = [ ] [[package]] -name = "anyhow" -version = "1.0.69" +name = "anstyle" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +checksum = "80c697cc33851b02ab0c26b2e8a211684fbe627ff1cc506131f35026dd7686dd" + +[[package]] +name = "anyhow" +version = "1.0.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" [[package]] name = "anymap" @@ -178,7 +184,7 @@ dependencies = [ "strum_macros", "thiserror", "typed-builder", - "uuid 1.3.0", + "uuid", "zerocopy", ] @@ -191,15 +197,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "arbitrary" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e90af4de65aa7b293ef2d09daff88501eb254f58edde2e1ac02c82d873eadad" -dependencies = [ - "derive_arbitrary", -] - [[package]] name = "arc-swap" version = "1.6.0" @@ -224,8 +221,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c6368f9ae5c6ec403ca910327ae0c9437b0a85255b6950c90d497e6177f6e5e" dependencies = [ "proc-macro-hack", - "quote 1.0.23", - "syn 1.0.108", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -255,12 +252,6 @@ dependencies = [ "term", ] -[[package]] -name = "ascii_utils" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71938f30533e4d95a6d17aa530939da3842c2ab6f4f84b9dae68447e4129f74a" - [[package]] name = "assert-json-diff" version = "2.0.2" @@ -273,11 +264,12 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.0.8" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9834fcc22e0874394a010230586367d4a3e9f11b560f469262678547e1d2575e" +checksum = "ec0b2340f55d9661d76793b2bfc2eb0e62689bd79d067a95707ea762afd5e9dd" dependencies = [ - "bstr 1.3.0", + "anstyle", + "bstr 1.4.0", "doc-comment", "predicates", "predicates-core", @@ -296,6 +288,19 @@ dependencies = [ "futures-core", ] +[[package]] +name = "async-compat" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b48b4ff0c2026db683dea961cd8ea874737f56cffca86fa84415eaddc51c00d" +dependencies = [ + "futures-core", + "futures-io", + "once_cell", + "pin-project-lite", + "tokio", +] + [[package]] name = "async-compression" version = "0.3.15" @@ -365,9 +370,9 @@ dependencies = [ [[package]] name = "async-graphql" -version = "5.0.6" +version = "5.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692d27c9d6fbb7afafd092706cbb3e4a2087297e10e1f0ca82b3f950f31d9258" +checksum = "6f0ed623e2503b45d875461e5de88a1b3466cf2ed3e43cf189a102a641b93f19" dependencies = [ "async-graphql-derive", "async-graphql-parser", @@ -377,10 +382,8 @@ dependencies = [ "base64 0.13.1", "bytes 1.4.0", "chrono", - "fast_chemail", "fnv", "futures-util", - "handlebars", "http", "indexmap", "mime", @@ -393,31 +396,30 @@ dependencies = [ "serde_json", "serde_urlencoded", "static_assertions", - "tempfile", "thiserror", ] [[package]] name = "async-graphql-derive" -version = "5.0.6" +version = "5.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec10e63a513389190e9f8f32453bfcfeef271e25e841d61905985f838a5345eb" +checksum = "cebcf27112b969c4ff2a003b318ab5efde96055f9d0ee3344a3b3831fa2932ba" dependencies = [ "Inflector", "async-graphql-parser", "darling 0.14.2", "proc-macro-crate 1.2.1", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", "thiserror", ] [[package]] name = "async-graphql-parser" -version = "5.0.6" +version = "5.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79500e9bed6b3cf5e1d3960264b7dbc275dd45b56a3f919c30f0cbbf3ea9cba" +checksum = "631770464ad2492da9af6b70048e9e477ef7c1e55fdbfb0719f3330cfa87d8e9" dependencies = [ "async-graphql-value", "pest", @@ -427,9 +429,9 @@ dependencies = [ [[package]] name = "async-graphql-value" -version = "5.0.6" +version = "5.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14fde4382b75c27fafcaca59b423d4530f73e7f62f41bfa38e8f249026d22ed" +checksum = "b59633f68ae4b858e14ec761e02455c575327249cbefed3af067a0b26d76daa9" dependencies = [ "bytes 1.4.0", "indexmap", @@ -439,9 +441,9 @@ dependencies = [ [[package]] name = "async-graphql-warp" -version = "5.0.6" +version = "5.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef44ae245e692202e92a683ced6ee27b4129aa71842df97890f34a652ab634" +checksum = "0bb6bf41fb7c140172034290b10c17eca6ebf37af148301f913dc95eb625083b" dependencies = [ "async-graphql", "futures-util", @@ -523,13 +525,13 @@ dependencies = [ [[package]] name = "async-recursion" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b015a331cc64ebd1774ba119538573603427eaace0a1950c423ab971f903796" +checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 2.0.10", ] [[package]] @@ -549,9 +551,9 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4655ae1a7b0cdf149156f780c5bf3f1352bc53cbd9e0a361a7ef7b22947e965" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -562,13 +564,13 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" [[package]] name = "async-trait" -version = "0.1.64" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 2.0.10", ] [[package]] @@ -901,11 +903,11 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "0.53.0" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee0d796882321e91ca7b991ab6193864e04b605be3a6c18adb9134a90d5a860" +checksum = "19a4f5c05c8646d12b7bb3f18c04edc5ac5e8928ab80e1649e568190f2bc7b79" dependencies = [ - "aws-smithy-http 0.53.1", + "aws-smithy-http 0.55.0", "form_urlencoded", "hex", "hmac", @@ -1007,11 +1009,11 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.53.1" +version = "0.54.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29dcab29afbea7726f5c10c7be0c38666d7eb07db551580b3b26ed7cfb5d1935" +checksum = "873f316f1833add0d3aa54ed1b0cd252ddd88c792a0cf839886400099971e844" dependencies = [ - "aws-smithy-types 0.53.1", + "aws-smithy-types 0.54.4", "bytes 1.4.0", "bytes-utils", "futures-core", @@ -1027,11 +1029,11 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.54.3" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78abf16f8667b9176737cfffd1dd4ad07d350ef5dba01d01fdec5f31265f7134" +checksum = "d78510732b81040689dc146e3693bfbcf388ab88cbda667d3ef67f8869b0744a" dependencies = [ - "aws-smithy-types 0.54.3", + "aws-smithy-types 0.55.0", "bytes 1.4.0", "bytes-utils", "futures-core", @@ -1062,12 +1064,12 @@ dependencies = [ [[package]] name = "aws-smithy-http-tower" -version = "0.54.3" +version = "0.54.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d517ac2476efc1820228c2fdfdcb17d3bea8695558bd67584a62a47c12b41918" +checksum = "4f38231d3f5dac9ac7976f44e12803add1385119ffca9e5f050d8e980733d164" dependencies = [ - "aws-smithy-http 0.54.3", - "aws-smithy-types 0.54.3", + "aws-smithy-http 0.54.4", + "aws-smithy-types 0.54.4", "bytes 1.4.0", "http", "http-body", @@ -1109,9 +1111,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "0.53.1" +version = "0.54.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2013465a070decdeb3e85ceb3370ae85ba05f56f914abfd89858d7281c4f12c3" +checksum = "8161232eda10290f5136610a1eb9de56aceaccd70c963a26a260af20ac24794f" dependencies = [ "base64-simd", "itoa", @@ -1122,9 +1124,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "0.54.3" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee8d2056dc5f10094d5e753ac5c649e8996869f0649b641e470950151596db73" +checksum = "474d145c2e0f82892841d2502bd546ca0dbc1e4e242c3563d96e7061054c268f" dependencies = [ "base64-simd", "itoa", @@ -1180,12 +1182,10 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "serde_json", - "serde_path_to_error", "sync_wrapper", "tokio", "tower", - "tower-http", + "tower-http 0.3.5", "tower-layer", "tower-service", ] @@ -1216,7 +1216,7 @@ dependencies = [ "base64 0.13.1", "bytes 1.4.0", "dyn-clone", - "futures 0.3.26", + "futures 0.3.28", "getrandom 0.2.8", "http-types", "log", @@ -1230,7 +1230,7 @@ dependencies = [ "serde_json", "time", "url", - "uuid 1.3.0", + "uuid", ] [[package]] @@ -1243,14 +1243,14 @@ dependencies = [ "azure_core", "base64 0.13.1", "fix-hidden-lifetime-bug", - "futures 0.3.26", + "futures 0.3.28", "log", "oauth2", "serde", "serde_json", "time", "url", - "uuid 1.3.0", + "uuid", ] [[package]] @@ -1263,7 +1263,7 @@ dependencies = [ "azure_core", "base64 0.13.1", "bytes 1.4.0", - "futures 0.3.26", + "futures 0.3.28", "hmac", "log", "once_cell", @@ -1274,7 +1274,7 @@ dependencies = [ "sha2 0.10.6", "time", "url", - "uuid 1.3.0", + "uuid", ] [[package]] @@ -1287,7 +1287,7 @@ dependencies = [ "azure_storage", "base64 0.13.1", "bytes 1.4.0", - "futures 0.3.26", + "futures 0.3.28", "log", "md5", "serde", @@ -1296,7 +1296,7 @@ dependencies = [ "serde_json", "time", "url", - "uuid 1.3.0", + "uuid", ] [[package]] @@ -1310,6 +1310,18 @@ dependencies = [ "rand 0.8.5", ] +[[package]] +name = "backon" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f34fac4d7cdaefa2deded0eda2d5d59dbfd43370ff3f856209e72340ae84c294" +dependencies = [ + "futures 0.3.28", + "pin-project", + "rand 0.8.5", + "tokio", +] + [[package]] name = "base16" version = "0.2.1" @@ -1330,11 +1342,12 @@ checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" [[package]] name = "base64-simd" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "781dd20c3aff0bd194fe7d2a977dd92f21c173891f3a03b677359e5fa457e5d5" +checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" dependencies = [ - "simd-abstraction", + "outref", + "vsimd", ] [[package]] @@ -1348,9 +1361,9 @@ dependencies = [ [[package]] name = "base64ct" -version = "1.1.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6b4d9b1225d28d360ec6a231d65af1fd99a2a095154c8040689617290569c5c" +checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" [[package]] name = "bit-set" @@ -1385,8 +1398,8 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd9e32d7420c85055e8107e5b2463c4eeefeaac18b52359fe9f9c08a18f342b2" dependencies = [ - "quote 1.0.23", - "syn 1.0.108", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -1484,7 +1497,7 @@ checksum = "602bda35f33aeb571cef387dcd4042c643a8bf689d8aaac2cc47ea24cb7bc7e0" dependencies = [ "chrono", "serde", - "serde_with 2.2.0", + "serde_with 2.3.1", ] [[package]] @@ -1506,8 +1519,8 @@ dependencies = [ "borsh-derive-internal", "borsh-schema-derive-internal", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.51", - "syn 1.0.108", + "proc-macro2 1.0.55", + "syn 1.0.109", ] [[package]] @@ -1516,9 +1529,9 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61820b4c5693eafb998b1e67485423c923db4a75f72585c247bdee32bad81e7b" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -1527,16 +1540,16 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c76cdbfa13def20d1f8af3ae7b3c6771f06352a74221d8851262ac384c122b8e" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "bson" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d76085681585d39016f4d3841eb019201fc54d2dd0d92ad1e4fab3bfb32754" +checksum = "8746d07211bb12a7c34d995539b4a2acd4e0b0e757de98ce2ab99bcf17443fad" dependencies = [ "ahash 0.7.6", "base64 0.13.1", @@ -1548,7 +1561,7 @@ dependencies = [ "serde_bytes", "serde_json", "time", - "uuid 1.3.0", + "uuid", ] [[package]] @@ -1564,9 +1577,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1" +checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" dependencies = [ "memchr", "once_cell", @@ -1596,9 +1609,9 @@ version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13e576ebe98e605500b3c8041bb888e966653577172df6dd97398714eb30b9bf" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -1644,9 +1657,9 @@ dependencies = [ [[package]] name = "bytesize" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c58ec36aac5066d5ca17df51b3e70279f5670a72102f5752cb7e7c856adfc70" +checksum = "38fcc2979eff34a4b84e1cf9a1e3da42a7d44b3b690a40cdcb23e3d556cfb2e5" [[package]] name = "cache-padded" @@ -1664,7 +1677,7 @@ dependencies = [ "async_once", "cached_proc_macro", "cached_proc_macro_types", - "futures 0.3.26", + "futures 0.3.28", "hashbrown 0.13.2", "instant", "lazy_static", @@ -1681,9 +1694,9 @@ checksum = "e10ca87c81aaa3a949dbbe2b5e6c2c45dbc94ba4897e45ea31ff9ec5087be3dc" dependencies = [ "cached_proc_macro_types", "darling 0.14.2", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -1755,8 +1768,8 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.22" -source = "git+https://github.com/vectordotdev/chrono.git?branch=no-default-time-v0.4.22-1#920ff24cabedcec0f8459b8d9681cbac186dfb58" +version = "0.4.24" +source = "git+https://github.com/vectordotdev/chrono.git?tag=v0.4.24-no-default-time-1#7ec1ad93833787da5df64898fb3e6206221c6833" dependencies = [ "iana-time-zone", "js-sys", @@ -1869,50 +1882,58 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.6" +version = "4.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3" +checksum = "906f7fe1da4185b7a282b2bc90172a496f9def1aca4545fe7526810741591e14" +dependencies = [ + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap-verbosity-flag" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1eef05769009513df2eb1c3b4613e7fad873a14c600ff025b08f250f59fee7de" +dependencies = [ + "clap 4.1.14", + "log", +] + +[[package]] +name = "clap_builder" +version = "4.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "351f9ad9688141ed83dfd8f5fb998a06225ef444b48ff4dc43de6d409b7fd10b" dependencies = [ "bitflags", - "clap_derive", - "clap_lex 0.3.0", + "clap_lex 0.4.1", "is-terminal", - "once_cell", "strsim 0.10.0", "termcolor", "terminal_size 0.2.2", ] -[[package]] -name = "clap-verbosity-flag" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e2b6c3dcdb73299f48ae05b294da14e2f560b3ed2c09e742269eb1b22af231" -dependencies = [ - "clap 4.1.6", - "log", -] - [[package]] name = "clap_complete" -version = "4.1.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd125be87bf4c255ebc50de0b7f4d2a6201e8ac3dc86e39c0ad081dc5e7236fe" +checksum = "01c22dcfb410883764b29953103d9ef7bb8fe21b3fa1158bc99986c2067294bd" dependencies = [ - "clap 4.1.6", + "clap 4.1.14", ] [[package]] name = "clap_derive" -version = "4.1.0" +version = "4.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" +checksum = "81d7dc0031c3a59a04fc2ba395c8e2dd463cba1859275f065d225f6122221b45" dependencies = [ "heck 0.4.0", - "proc-macro-error", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 2.0.10", ] [[package]] @@ -1926,12 +1947,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" -dependencies = [ - "os_str_bytes", -] +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" [[package]] name = "clipboard-win" @@ -1960,14 +1978,14 @@ dependencies = [ "apache-avro", "bytes 1.4.0", "chrono", + "csv", "derivative", "dyn-clone", - "futures 0.3.26", + "futures 0.3.28", "indoc", - "lookup", "memchr", "once_cell", - "ordered-float 3.4.0", + "ordered-float 3.6.0", "prost", "regex", "serde", @@ -1985,6 +2003,7 @@ dependencies = [ "vector-config-common", "vector-config-macros", "vector-core", + "vector-lookup", ] [[package]] @@ -2059,7 +2078,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e37668cb35145dcfaa1931a5f37fde375eeae8068b4c0d2f289da28a270b2d2c" dependencies = [ - "directories", + "directories 4.0.1", "serde", "thiserror", "toml 0.5.11", @@ -2100,7 +2119,7 @@ dependencies = [ "console-api", "crossbeam-channel", "crossbeam-utils", - "futures 0.3.26", + "futures 0.3.28", "hdrhistogram", "humantime", "prost-types", @@ -2121,6 +2140,12 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d6f2aa4d0537bcc1c74df8755072bd31c1ef1a3a1b85a68e8404a8c353b7b8b" +[[package]] +name = "const-oid" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b" + [[package]] name = "convert_case" version = "0.4.0" @@ -2203,7 +2228,7 @@ dependencies = [ "ciborium", "clap 3.2.23", "criterion-plot", - "futures 0.3.26", + "futures 0.3.28", "itertools", "lazy_static", "num-traits", @@ -2275,9 +2300,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ "cfg-if", ] @@ -2300,9 +2325,9 @@ dependencies = [ [[package]] name = "crossterm" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77f67c7faacd4db07a939f55d66a983a5355358a1f17d32cc9a8d01d1266b9ce" +checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" dependencies = [ "bitflags", "crossterm_winapi", @@ -2342,9 +2367,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af91f40b7355f82b0a891f50e70399475945bb0b0da4f1700ce60761c9d3e359" +checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad" dependencies = [ "csv-core", "itoa", @@ -2367,8 +2392,18 @@ version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ - "quote 1.0.23", - "syn 1.0.108", + "quote 1.0.26", + "syn 1.0.109", +] + +[[package]] +name = "ctor" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd4056f63fce3b82d852c3da92b08ea59959890813a7f4ce9c0ff85b10cf301b" +dependencies = [ + "quote 1.0.26", + "syn 2.0.10", ] [[package]] @@ -2420,10 +2455,10 @@ dependencies = [ "cc", "codespan-reporting", "once_cell", - "proc-macro2 1.0.51", - "quote 1.0.23", + "proc-macro2 1.0.55", + "quote 1.0.26", "scratch", - "syn 1.0.108", + "syn 1.0.109", ] [[package]] @@ -2438,9 +2473,9 @@ version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -2471,10 +2506,10 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.51", - "quote 1.0.23", + "proc-macro2 1.0.55", + "quote 1.0.26", "strsim 0.10.0", - "syn 1.0.108", + "syn 1.0.109", ] [[package]] @@ -2485,10 +2520,10 @@ checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.51", - "quote 1.0.23", + "proc-macro2 1.0.55", + "quote 1.0.26", "strsim 0.10.0", - "syn 1.0.108", + "syn 1.0.109", ] [[package]] @@ -2498,8 +2533,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core 0.13.4", - "quote 1.0.23", - "syn 1.0.108", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -2509,8 +2544,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" dependencies = [ "darling_core 0.14.2", - "quote 1.0.23", - "syn 1.0.108", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -2541,6 +2576,7 @@ checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" [[package]] name = "datadog-filter" version = "0.1.0" +source = "git+https://github.com/vectordotdev/vrl?rev=v0.2.0#258cc611080c1bdb5ed6897e8a79b76ab2038fcb" dependencies = [ "datadog-search-syntax", "dyn-clone", @@ -2550,32 +2586,31 @@ dependencies = [ [[package]] name = "datadog-grok" version = "0.1.0" +source = "git+https://github.com/vectordotdev/vrl?rev=v0.2.0#258cc611080c1bdb5ed6897e8a79b76ab2038fcb" dependencies = [ "bytes 1.4.0", "chrono", "chrono-tz", - "criterion", "lalrpop", "lalrpop-util", "lookup", "nom", "once_cell", "onig", - "ordered-float 3.4.0", + "ordered-float 3.6.0", "peeking_take_while", "regex", "serde_json", "thiserror", "tracing 0.1.37", - "tracing-test", "value", - "vector-common", "vrl-compiler", ] [[package]] name = "datadog-search-syntax" version = "0.1.0" +source = "git+https://github.com/vectordotdev/vrl?rev=v0.2.0#258cc611080c1bdb5ed6897e8a79b76ab2038fcb" dependencies = [ "itertools", "once_cell", @@ -2621,7 +2656,18 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79b71cca7d95d7681a4b3b9cdf63c8dbc3730d0584c2c74e31416d64a90493f4" dependencies = [ - "const-oid", + "const-oid 0.6.2", +] + +[[package]] +name = "der" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" +dependencies = [ + "const-oid 0.9.1", + "pem-rfc7468 0.6.0", + "zeroize", ] [[package]] @@ -2630,20 +2676,9 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", -] - -[[package]] -name = "derive_arbitrary" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8beee4701e2e229e8098bbdecdca12449bc3e322f137d269182fa1291e20bd00" -dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -2653,10 +2688,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.51", - "quote 1.0.23", + "proc-macro2 1.0.55", + "quote 1.0.26", "rustc_version 0.4.0", - "syn 1.0.108", + "syn 1.0.109", ] [[package]] @@ -2687,6 +2722,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer 0.10.3", + "const-oid 0.9.1", "crypto-common", "subtle", ] @@ -2697,7 +2733,16 @@ version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" dependencies = [ - "dirs-sys", + "dirs-sys 0.3.7", +] + +[[package]] +name = "directories" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74be3be809c18e089de43bdc504652bb2bc473fca8756131f8689db8cf079ba9" +dependencies = [ + "dirs-sys 0.4.0", ] [[package]] @@ -2706,7 +2751,7 @@ version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" dependencies = [ - "dirs-sys", + "dirs-sys 0.3.7", ] [[package]] @@ -2730,6 +2775,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "dirs-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b" +dependencies = [ + "libc", + "redox_users", + "windows-sys 0.45.0", +] + [[package]] name = "dirs-sys-next" version = "0.1.2" @@ -2741,6 +2797,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "dlv-list" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" + [[package]] name = "dns-lookup" version = "1.0.8" @@ -2789,17 +2851,17 @@ checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c" [[package]] name = "dyn-clone" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60" +checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" [[package]] name = "ed25519" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" +checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ - "signature", + "signature 1.6.4", ] [[package]] @@ -2876,9 +2938,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" dependencies = [ "heck 0.4.0", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -2888,9 +2950,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ "heck 0.4.0", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -2900,9 +2962,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" dependencies = [ "once_cell", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -2920,9 +2982,9 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -2963,20 +3025,6 @@ dependencies = [ "serde", ] -[[package]] -name = "err-derive" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34a887c8df3ed90498c1c437ce21f211c8e27672921a8ffa293cb8d6d4caa9e" -dependencies = [ - "proc-macro-error", - "proc-macro2 1.0.51", - "quote 1.0.23", - "rustversion", - "syn 1.0.108", - "synstructure", -] - [[package]] name = "errno" version = "0.2.8" @@ -2988,6 +3036,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "errno" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.45.0", +] + [[package]] name = "errno-dragonfly" version = "0.1.2" @@ -3064,15 +3123,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" -[[package]] -name = "fast_chemail" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "495a39d30d624c2caabe6312bfead73e7717692b44e0b32df168c275a2e8e9e4" -dependencies = [ - "ascii_utils", -] - [[package]] name = "fastrand" version = "1.8.0" @@ -3082,29 +3132,18 @@ dependencies = [ "instant", ] -[[package]] -name = "fd-lock" -version = "3.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb21c69b9fea5e15dbc1049e4b77145dd0ba1c84019c488102de0dc4ea4b0a27" -dependencies = [ - "cfg-if", - "rustix 0.36.4", - "windows-sys 0.42.0", -] - [[package]] name = "file-source" version = "0.1.0" dependencies = [ - "bstr 1.3.0", + "bstr 1.4.0", "bytes 1.4.0", "chrono", "crc", "criterion", "dashmap", "flate2", - "futures 0.3.26", + "futures 0.3.28", "glob", "indexmap", "libc", @@ -3130,7 +3169,7 @@ checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "windows-sys 0.42.0", ] @@ -3149,9 +3188,9 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4c81935e123ab0741c4c4f0d9b8377e5fb21d3de7e062fa4b1263b1fbcba1ea" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -3160,6 +3199,12 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" +[[package]] +name = "flagset" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda653ca797810c02f7ca4b804b40b8b95ae046eb989d356bce17919a8c25499" + [[package]] name = "flate2" version = "1.0.25" @@ -3251,9 +3296,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -3266,9 +3311,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -3276,15 +3321,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -3293,9 +3338,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" @@ -3314,26 +3359,26 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 2.0.10", ] [[package]] name = "futures-sink" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-timer" @@ -3343,9 +3388,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures 0.1.31", "futures-channel", @@ -3401,9 +3446,9 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb19fe8de3ea0920d282f7b77dd4227aea6b8b999b42cdf0ca41b2472b14443a" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -3432,7 +3477,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8af59a261bcf42f45d1b261232847b9b850ba0a1419d6100698246fb66e9240" dependencies = [ "arc-swap", - "futures 0.3.26", + "futures 0.3.28", "log", "reqwest", "serde", @@ -3452,7 +3497,7 @@ checksum = "c390a940a5d157878dd057c78680a33ce3415bcd05b4799509ea44210914b4d5" dependencies = [ "cfg-if", "dashmap", - "futures 0.3.26", + "futures 0.3.28", "futures-timer", "no-std-compat", "nonzero_ext", @@ -3501,11 +3546,11 @@ dependencies = [ "graphql-parser", "heck 0.4.0", "lazy_static", - "proc-macro2 1.0.51", - "quote 1.0.23", + "proc-macro2 1.0.55", + "quote 1.0.26", "serde", "serde_json", - "syn 1.0.108", + "syn 1.0.109", ] [[package]] @@ -3515,8 +3560,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d52fc9cde811f44b15ec0692b31e56a3067f6f431c5ace712f286e47c1dacc98" dependencies = [ "graphql_client_codegen", - "proc-macro2 1.0.51", - "syn 1.0.108", + "proc-macro2 1.0.55", + "syn 1.0.109", ] [[package]] @@ -3531,9 +3576,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" dependencies = [ "bytes 1.4.0", "fnv", @@ -3554,20 +3599,6 @@ version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" -[[package]] -name = "handlebars" -version = "4.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "035ef95d03713f2c347a72547b7cd38cbc9af7cd51e6099fb62d586d4a6dee3a" -dependencies = [ - "log", - "pest", - "pest_derive", - "serde", - "serde_json", - "thiserror", -] - [[package]] name = "hash_hasher" version = "2.0.3" @@ -3694,7 +3725,7 @@ version = "0.1.0-rc.1" source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#76fa765c7ed7fbe43d1465bf52da6b8d19f2d2a9" dependencies = [ "cfg-if", - "futures 0.3.26", + "futures 0.3.28", "glob", "heim-common", "heim-runtime", @@ -3774,7 +3805,7 @@ name = "heim-runtime" version = "0.1.0-rc.1" source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#76fa765c7ed7fbe43d1465bf52da6b8d19f2d2a9" dependencies = [ - "futures 0.3.26", + "futures 0.3.28", "futures-timer", "once_cell", "smol", @@ -3893,9 +3924,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.24" +version = "0.14.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" +checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" dependencies = [ "bytes 1.4.0", "futures-channel", @@ -3940,7 +3971,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc" dependencies = [ "bytes 1.4.0", - "futures 0.3.26", + "futures 0.3.28", "headers", "http", "hyper", @@ -4056,9 +4087,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", @@ -4080,9 +4111,9 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fe2b9d82064e8a0226fddb3547f37f28eaa46d0fc210e275d835f08cf3b76a7" +checksum = "9f2cb48b81b1dc9f39676bf99f5499babfec7cd8fe14307f7b3d747208fb5690" [[package]] name = "infer" @@ -4092,19 +4123,19 @@ checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" [[package]] name = "infer" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3" +checksum = "f551f8c3a39f68f986517db0d1759de85881894fdc7db798bd2a9df9cb04b7fc" [[package]] name = "inherent" -version = "1.0.4" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb659d59c4af6c9dc568b13db431174ab5fa961aa53f5aad7f42fb710c06bc46" +checksum = "a036328c11e86e024522cb1e9b78ba9df3e316995e004e98854a18e4a326d2e1" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -4148,11 +4179,11 @@ dependencies = [ [[package]] name = "inventory" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16fe3b35d64bd1f72917f06425e7573a2f63f74f42c8f56e53ea6826dde3a2b5" +checksum = "7741301a6d6a9b28ce77c0fb77a4eb116b6bc8f3bef09923f7743d059c4157d3" dependencies = [ - "ctor", + "ctor 0.2.0", "ghost", ] @@ -4243,16 +4274,18 @@ checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" [[package]] name = "jni" -version = "0.20.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" dependencies = [ "cesu8", + "cfg-if", "combine 4.6.6", "jni-sys", "log", "thiserror", "walkdir", + "windows-sys 0.45.0", ] [[package]] @@ -4307,12 +4340,26 @@ dependencies = [ "serde_json", ] +[[package]] +name = "jsonwebtoken" +version = "8.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09f4f04699947111ec1733e71778d763555737579e44b85844cae8e1940a1828" +dependencies = [ + "base64 0.13.1", + "pem", + "ring", + "serde", + "serde_json", + "simple_asn1", +] + [[package]] name = "k8s-e2e-tests" version = "0.1.0" dependencies = [ "env_logger 0.10.0", - "futures 0.3.26", + "futures 0.3.28", "indoc", "k8s-openapi", "k8s-test-framework", @@ -4413,7 +4460,7 @@ dependencies = [ "chrono", "dirs-next", "either", - "futures 0.3.26", + "futures 0.3.28", "http", "http-body", "hyper", @@ -4434,7 +4481,7 @@ dependencies = [ "tokio-native-tls", "tokio-util", "tower", - "tower-http", + "tower-http 0.3.5", "tracing 0.1.37", ] @@ -4464,7 +4511,7 @@ dependencies = [ "ahash 0.8.2", "backoff", "derivative", - "futures 0.3.26", + "futures 0.3.28", "json-patch", "k8s-openapi", "kube-client", @@ -4504,9 +4551,9 @@ dependencies = [ [[package]] name = "lalrpop-util" -version = "0.19.8" +version = "0.19.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf796c978e9b4d983414f4caedc9273aa33ee214c5b887bd55fde84c85d2dc4" +checksum = "e5c1f7869c94d214466c5fd432dfed12c379fd87786768d36455892d46b18edd" dependencies = [ "regex", ] @@ -4538,12 +4585,15 @@ name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin 0.5.2", +] [[package]] name = "libc" -version = "0.2.139" +version = "0.2.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" [[package]] name = "libflate" @@ -4620,13 +4670,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f" [[package]] -name = "listenfd" -version = "1.0.0" +name = "linux-raw-sys" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e4fcc00ff6731d94b70e16e71f43bda62883461f31230742e3bc6dddf12988" +checksum = "cd550e73688e6d578f0ac2119e32b797a327631a42f9433e59d02e139c8df60d" + +[[package]] +name = "listenfd" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0500463acd96259d219abb05dc57e5a076ef04b2db9a2112846929b5f174c96" dependencies = [ "libc", - "uuid 1.3.0", + "uuid", "winapi", ] @@ -4676,8 +4732,8 @@ dependencies = [ [[package]] name = "lookup" version = "0.1.0" +source = "git+https://github.com/vectordotdev/vrl?rev=v0.2.0#258cc611080c1bdb5ed6897e8a79b76ab2038fcb" dependencies = [ - "criterion", "inherent", "lalrpop", "lalrpop-util", @@ -4685,18 +4741,14 @@ dependencies = [ "quickcheck", "regex", "serde", - "serde_json", "snafu", - "tracing 0.1.37", - "vector-config", - "vector-config-macros", ] [[package]] name = "lru" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e7d46de488603ffdd5f30afbc64fbba2378214a2c3a2fb83abf3d33126df17" +checksum = "03f1160296536f10c833a82dca22267d5486734230d47bf00bf435885814ba1e" [[package]] name = "lru-cache" @@ -4760,6 +4812,15 @@ dependencies = [ "libc", ] +[[package]] +name = "mach2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" +dependencies = [ + "libc", +] + [[package]] name = "malloc_buf" version = "0.0.6" @@ -4882,9 +4943,9 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "731f8ecebd9f3a4aa847dfe75455e4757a45da40a7793d2f0b1f9b6ed18b23f3" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -4919,7 +4980,7 @@ dependencies = [ "ordered-float 2.10.0", "parking_lot", "portable-atomic", - "quanta", + "quanta 0.10.1", "radix_trie", "sketches-ddsketch", ] @@ -4969,9 +5030,9 @@ dependencies = [ [[package]] name = "mlua" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ee2ad7a9aa69056b148d9d590344bc155d3ce0d2200e3b2838f7034f6ba33c1" +checksum = "ea8ce6788556a67d90567809c7de94dfef2ff1f47ff897aeee935bcfbcdf5735" dependencies = [ "bstr 0.2.17", "cc", @@ -4991,9 +5052,9 @@ checksum = "717e29a243b81f8130e31e24e04fb151b04a44b5a7d05370935f7d937e9de06d" [[package]] name = "mongodb" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a1df476ac9541b0e4fdc8e2cc48884e66c92c933cd17a1fd75e68caf75752e" +checksum = "a37fe10c1485a0cd603468e284a1a8535b4ecf46808f5f7de3639a1e1252dbf8" dependencies = [ "async-trait", "base64 0.13.1", @@ -5001,20 +5062,21 @@ dependencies = [ "bson", "chrono", "derivative", + "derive_more", "futures-core", "futures-executor", + "futures-io", "futures-util", "hex", "hmac", "lazy_static", "md-5", - "os_info", "pbkdf2", "percent-encoding", "rand 0.8.5", "rustc_version_runtime", "rustls 0.20.7", - "rustls-pemfile 0.3.0", + "rustls-pemfile 1.0.1", "serde", "serde_bytes", "serde_with 1.14.0", @@ -5031,7 +5093,7 @@ dependencies = [ "trust-dns-proto 0.21.2", "trust-dns-resolver", "typed-builder", - "uuid 0.8.2", + "uuid", "webpki-roots", ] @@ -5175,23 +5237,10 @@ dependencies = [ "memoffset 0.6.5", ] -[[package]] -name = "nix" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" -dependencies = [ - "autocfg", - "bitflags", - "cfg-if", - "libc", -] - [[package]] name = "nix" version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +source = "git+https://github.com/vectordotdev/nix.git?branch=memfd/gnu/musl#6c53a918d2d5bf4307fd60a19d9e10913ae71eeb" dependencies = [ "bitflags", "cfg-if", @@ -5250,15 +5299,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "nom8" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" -dependencies = [ - "memchr", -] - [[package]] name = "nonzero_ext" version = "0.3.0" @@ -5322,6 +5362,23 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-bigint-dig" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2399c9463abc5f909349d8aa9ba080e0b88b3ce2885389b60b993f39b1a56905" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand 0.8.5", + "smallvec", + "zeroize", +] + [[package]] name = "num-complex" version = "0.4.2" @@ -5352,6 +5409,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-rational" version = "0.3.2" @@ -5385,23 +5453,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0072973714303aa6e3631c7e8e777970cf4bdd25dc4932e41031027b8bcc4e" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0629cbd6b897944899b1f10496d9c4a7ac5878d45fd61bc22e9e79bfbbc29597" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.2.1", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -5497,6 +5565,39 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +[[package]] +name = "opendal" +version = "0.30.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a89d32f1761175aff31cb233330e206c2a8d9c3e96b0af3e74d0e7eff978b46a" +dependencies = [ + "anyhow", + "async-compat", + "async-trait", + "backon", + "base64 0.21.0", + "bytes 1.4.0", + "flagset", + "futures 0.3.28", + "http", + "hyper", + "log", + "md-5", + "once_cell", + "parking_lot", + "percent-encoding", + "pin-project", + "quick-xml 0.27.1", + "reqsign", + "reqwest", + "serde", + "serde_json", + "time", + "tokio", + "ureq", + "uuid", +] + [[package]] name = "openidconnect" version = "2.4.0" @@ -5523,9 +5624,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.45" +version = "0.10.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" +checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2" dependencies = [ "bitflags", "cfg-if", @@ -5542,9 +5643,9 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -5564,9 +5665,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.80" +version = "0.9.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" +checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b" dependencies = [ "autocfg", "cc", @@ -5583,14 +5684,14 @@ dependencies = [ "bytes 1.4.0", "chrono", "hex", - "lookup", - "ordered-float 3.4.0", + "ordered-float 3.6.0", "prost", "prost-build", "tonic", "tonic-build", "value", "vector-core", + "vector-lookup", ] [[package]] @@ -5604,18 +5705,28 @@ dependencies = [ [[package]] name = "ordered-float" -version = "3.4.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d84eb1409416d254e4a9c8fa56cc24701755025b458f0fcd8e59e1f5f40c23bf" +checksum = "13a384337e997e6860ffbaa83708b2ef329fd8c54cb67a5f64d421e0f943254f" dependencies = [ "num-traits", ] [[package]] -name = "os_info" -version = "3.6.0" +name = "ordered-multimap" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c424bc68d15e0778838ac013b5b3449544d8133633d8016319e7e05a820b8c0" +checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" +dependencies = [ + "dlv-list", + "hashbrown 0.12.3", +] + +[[package]] +name = "os_info" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" dependencies = [ "log", "winapi", @@ -5638,10 +5749,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" [[package]] -name = "outref" -version = "0.1.0" +name = "output_vt100" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f222829ae9293e33a9f5e9f440c6760a3d450a64affe1846486b140db81c1f4" +checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" +dependencies = [ + "winapi", +] + +[[package]] +name = "outref" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" [[package]] name = "overload" @@ -5682,7 +5802,7 @@ checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", "windows-sys 0.42.0", ] @@ -5698,15 +5818,15 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" +checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" [[package]] name = "pbkdf2" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ "digest 0.10.6", ] @@ -5728,9 +5848,18 @@ dependencies = [ [[package]] name = "pem-rfc7468" -version = "0.2.4" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84e93a3b1cc0510b03020f33f21e62acdde3dcaef432edc95bea377fbd4c2cd4" +checksum = "8f22eb0e3c593294a99e9ff4b24cf6b752d43f193aa4415fe5077c159996d497" +dependencies = [ + "base64ct", +] + +[[package]] +name = "pem-rfc7468" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" dependencies = [ "base64ct", ] @@ -5743,9 +5872,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.5.5" +version = "2.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028accff104c4e513bad663bbcd2ad7cfd5304144404c31ed0a77ac103d00660" +checksum = "8cbd939b234e95d72bc393d51788aec68aeeb5d51e748ca08ff3aad58cb722f7" dependencies = [ "thiserror", "ucd-trie", @@ -5753,9 +5882,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.5" +version = "2.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac3922aac69a40733080f53c1ce7f91dcf57e1a5f6c52f421fadec7fbdc4b69" +checksum = "a81186863f3d0a27340815be8f2078dd8050b14cd71913db9fbda795e5f707d7" dependencies = [ "pest", "pest_generator", @@ -5763,22 +5892,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.5" +version = "2.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06646e185566b5961b4058dd107e0a7f56e77c3f484549fb119867773c0f202" +checksum = "75a1ef20bf3193c15ac345acb32e26b3dc3223aff4d77ae4fc5359567683796b" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "pest_meta" -version = "2.5.5" +version = "2.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6f60b2ba541577e2a0c307c8f39d1439108120eb7903adeb6497fa880c59616" +checksum = "5e3b284b1f13a20dc5ebc90aff59a51b8d7137c221131b52a7260c08cbc1cc80" dependencies = [ "once_cell", "pest", @@ -5863,9 +5992,9 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -5892,18 +6021,40 @@ dependencies = [ "tracing 0.1.37", ] +[[package]] +name = "pkcs1" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff33bdbdfc54cc98a2eca766ebdec3e1b8fb7387523d5c9c9a2891da856f719" +dependencies = [ + "der 0.6.1", + "pkcs8 0.9.0", + "spki 0.6.0", + "zeroize", +] + [[package]] name = "pkcs8" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee3ef9b64d26bad0536099c816c6734379e45bbd5f14798def6809e5cc350447" dependencies = [ - "der", - "pem-rfc7468", - "spki", + "der 0.4.5", + "pem-rfc7468 0.2.3", + "spki 0.4.1", "zeroize", ] +[[package]] +name = "pkcs8" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +dependencies = [ + "der 0.6.1", + "spki 0.6.0", +] + [[package]] name = "pkg-config" version = "0.3.26" @@ -5977,7 +6128,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1de0ea6504e07ca78355a6fb88ad0f36cafe9e696cbc6717f16a207f3a60be72" dependencies = [ - "futures 0.3.26", + "futures 0.3.28", "openssl", "tokio", "tokio-openssl", @@ -6028,10 +6179,11 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "predicates" -version = "2.1.3" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6bd09a7f7e68f3f0bf710fb7ab9c4615a488b58b5f653382a687701e458c92" +checksum = "1ba7d6ead3e3966038f68caa9fc1f860185d95a793180bbcfe0d0da47b3961ed" dependencies = [ + "anstyle", "difflib", "itertools", "predicates-core", @@ -6039,9 +6191,9 @@ dependencies = [ [[package]] name = "predicates-core" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72f883590242d3c6fc5bf50299011695fa6590c2c70eac95ee1bdb9a733ad1a2" +checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" [[package]] name = "predicates-tree" @@ -6053,6 +6205,18 @@ dependencies = [ "termtree", ] +[[package]] +name = "pretty_assertions" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +dependencies = [ + "ctor 0.1.26", + "diff", + "output_vt100", + "yansi", +] + [[package]] name = "prettydiff" version = "0.6.2" @@ -6070,8 +6234,8 @@ version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c142c0e46b57171fe0c528bee8c5b7569e80f0c17e377cd0e30ea57dbc11bb51" dependencies = [ - "proc-macro2 1.0.51", - "syn 1.0.108", + "proc-macro2 1.0.55", + "syn 1.0.109", ] [[package]] @@ -6115,9 +6279,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", "version_check", ] @@ -6127,8 +6291,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", + "proc-macro2 1.0.55", + "quote 1.0.26", "version_check", ] @@ -6155,9 +6319,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.51" +version = "1.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +checksum = "1d0dd4be24fcdcfeaa12a432d588dc59bbad6cad3510c67e74a2b6b2fc950564" dependencies = [ "unicode-ident", ] @@ -6198,23 +6362,11 @@ dependencies = [ "unarray", ] -[[package]] -name = "proptests" -version = "0.1.0" -dependencies = [ - "chrono", - "lookup", - "ordered-float 3.4.0", - "proptest", - "vrl-diagnostic", - "vrl-parser", -] - [[package]] name = "prost" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698" +checksum = "e48e50df39172a3e7eb17e14642445da64996989bc212b583015435d39a58537" dependencies = [ "bytes 1.4.0", "prost-derive", @@ -6222,9 +6374,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f8ad728fb08fe212df3c05169e940fbb6d9d16a877ddde14644a983ba2012e" +checksum = "2c828f93f5ca4826f97fedcbd3f9a536c16b12cff3dbbb4a007f932bbad95b12" dependencies = [ "bytes 1.4.0", "heck 0.4.0", @@ -6237,31 +6389,30 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 1.0.108", + "syn 1.0.109", "tempfile", "which", ] [[package]] name = "prost-derive" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d" +checksum = "4ea9b0f8cbe5e15a8a042d030bd96668db28ecb567ec37d691971ff5731d2b1b" dependencies = [ "anyhow", "itertools", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "prost-types" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e0526209433e96d83d750dd81a99118edbc55739e7e61a46764fd2ad537788" +checksum = "379119666929a1afd7a043aa6cf96fa67a6dce9af60c88095a4686dbce4c9c88" dependencies = [ - "bytes 1.4.0", "prost", ] @@ -6280,9 +6431,9 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -6298,7 +6449,7 @@ dependencies = [ "crc", "data-url", "flate2", - "futures 0.3.26", + "futures 0.3.28", "futures-io", "futures-timer", "log", @@ -6320,7 +6471,7 @@ dependencies = [ "tokio-native-tls", "tokio-util", "url", - "uuid 1.3.0", + "uuid", "zstd 0.11.2+zstd.1.5.2", ] @@ -6346,6 +6497,22 @@ dependencies = [ "winapi", ] +[[package]] +name = "quanta" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cc73c42f9314c4bdce450c77e6f09ecbddefbeddb1b5979ded332a3913ded33" +dependencies = [ + "crossbeam-utils", + "libc", + "mach2", + "once_cell", + "raw-cpuid", + "wasi 0.11.0+wasi-snapshot-preview1", + "web-sys", + "winapi", +] + [[package]] name = "quick-error" version = "1.2.3" @@ -6358,6 +6525,26 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" +[[package]] +name = "quick-xml" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffc053f057dd768a56f62cd7e434c42c831d296968997e9ac1f76ea7c2d14c41" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "quick-xml" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5c1a97b1bc42b1d550bfb48d4262153fe400a12bab1511821736f7eac76d7e2" +dependencies = [ + "memchr", + "serde", +] + [[package]] name = "quickcheck" version = "1.0.3" @@ -6375,9 +6562,9 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -6391,11 +6578,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.23" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ - "proc-macro2 1.0.51", + "proc-macro2 1.0.55", ] [[package]] @@ -6598,15 +6785,15 @@ dependencies = [ [[package]] name = "redis" -version = "0.22.3" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa8455fa3621f6b41c514946de66ea0531f57ca017b2e6c7cc368035ea5b46df" +checksum = "3ea8c51b5dc1d8e5fd3350ec8167f464ec0995e79f2e90a075b63371500d557f" dependencies = [ "arc-swap", "async-trait", "bytes 1.4.0", "combine 4.6.6", - "futures 0.3.26", + "futures 0.3.28", "futures-util", "itoa", "native-tls", @@ -6628,6 +6815,15 @@ dependencies = [ "bitflags", ] +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags", +] + [[package]] name = "redox_users" version = "0.4.3" @@ -6635,15 +6831,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom 0.2.8", - "redox_syscall", + "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.7.1" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" dependencies = [ "aho-corasick", "memchr", @@ -6661,18 +6857,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "rend" @@ -6684,10 +6871,41 @@ dependencies = [ ] [[package]] -name = "reqwest" -version = "0.11.14" +name = "reqsign" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" +checksum = "a7db6d8d2cd7fa61403d14de670f98d7cedac38143681c124943d7bb69258b3a" +dependencies = [ + "anyhow", + "backon", + "base64 0.21.0", + "bytes 1.4.0", + "dirs", + "form_urlencoded", + "hex", + "hmac", + "http", + "jsonwebtoken", + "log", + "once_cell", + "percent-encoding", + "quick-xml 0.28.1", + "rand 0.8.5", + "rsa", + "rust-ini", + "serde", + "serde_json", + "sha1", + "sha2 0.10.6", + "time", + "ureq", +] + +[[package]] +name = "reqwest" +version = "0.11.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" dependencies = [ "base64 0.21.0", "bytes 1.4.0", @@ -6704,6 +6922,7 @@ dependencies = [ "js-sys", "log", "mime", + "mime_guess", "native-tls", "once_cell", "percent-encoding", @@ -6778,9 +6997,9 @@ version = "0.7.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff26ed6c7c4dfc2aa9480b86a60e3c7233543a270a680e10758a507c5a4ce476" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -6844,10 +7063,41 @@ dependencies = [ ] [[package]] -name = "rust_decimal" -version = "1.28.1" +name = "rsa" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13cf35f7140155d02ba4ec3294373d513a3c7baa8364c162b030e33c61520a8" +checksum = "89b3896c9b7790b70a9aa314a30e4ae114200992a19c96cbe0ca6070edd32ab8" +dependencies = [ + "byteorder", + "digest 0.10.6", + "num-bigint-dig", + "num-integer", + "num-iter", + "num-traits", + "pkcs1", + "pkcs8 0.9.0", + "rand_core 0.6.4", + "sha2 0.10.6", + "signature 2.0.0", + "subtle", + "zeroize", +] + +[[package]] +name = "rust-ini" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + +[[package]] +name = "rust_decimal" +version = "1.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26bd36b60561ee1fb5ec2817f198b6fd09fa571c897a5e86d1487cfc2b096dfc" dependencies = [ "arrayvec 0.7.2", "borsh", @@ -6882,7 +7132,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.16", + "semver 1.0.17", ] [[package]] @@ -6902,7 +7152,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" dependencies = [ "bitflags", - "errno", + "errno 0.2.8", "io-lifetimes 0.7.5", "libc", "linux-raw-sys 0.0.46", @@ -6916,13 +7166,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb93e85278e08bb5788653183213d3a60fc242b10cb9be96586f5a73dcb67c23" dependencies = [ "bitflags", - "errno", + "errno 0.2.8", "io-lifetimes 1.0.3", "libc", "linux-raw-sys 0.1.3", "windows-sys 0.42.0", ] +[[package]] +name = "rustix" +version = "0.37.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e78cc525325c06b4a7ff02db283472f3c042b7ff0c391f96c6d5ac6f4f91b75" +dependencies = [ + "bitflags", + "errno 0.3.0", + "io-lifetimes 1.0.3", + "libc", + "linux-raw-sys 0.3.0", + "windows-sys 0.45.0", +] + [[package]] name = "rustls" version = "0.19.1" @@ -6981,15 +7245,6 @@ dependencies = [ "base64 0.13.1", ] -[[package]] -name = "rustls-pemfile" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360" -dependencies = [ - "base64 0.13.1", -] - [[package]] name = "rustls-pemfile" version = "1.0.1" @@ -7019,18 +7274,17 @@ dependencies = [ [[package]] name = "rustyline" -version = "10.1.1" +version = "11.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e83c32c3f3c33b08496e0d1df9ea8c64d39adb8eb36a1ebb1440c690697aef" +checksum = "5dfc8644681285d1fb67a467fb3021bfea306b99b4146b166a1fe3ada965eece" dependencies = [ "bitflags", "cfg-if", "clipboard-win", - "fd-lock", "libc", "log", "memchr", - "nix 0.25.1", + "nix 0.26.2", "scopeguard", "unicode-segmentation", "unicode-width", @@ -7040,9 +7294,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "same-file" @@ -7172,9 +7426,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" dependencies = [ "serde", ] @@ -7187,9 +7441,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.152" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" dependencies = [ "serde_derive", ] @@ -7200,7 +7454,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a78072b550e5c20bc4a9d1384be28809cbdb7b25b2b4707ddc6d908b7e6de3bf" dependencies = [ - "toml 0.7.2", + "toml 0.7.3", ] [[package]] @@ -7215,9 +7469,9 @@ dependencies = [ [[package]] name = "serde-wasm-bindgen" -version = "0.4.5" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b4c031cd0d9014307d82b8abf653c0290fbdaeb4c02d00c63cf52f728628bf" +checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" dependencies = [ "js-sys", "serde", @@ -7247,13 +7501,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 2.0.10", ] [[package]] @@ -7262,16 +7516,16 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "serde_json" -version = "1.0.93" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" +checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" dependencies = [ "indexmap", "itoa", @@ -7314,9 +7568,9 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -7352,9 +7606,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d904179146de381af4c93d3af6ca4984b3152db687dacb9c3c35e86f39809c" +checksum = "85456ffac572dc8826334164f2fb6fb40a7c766aebe195a2a21ee69ee2885ecf" dependencies = [ "base64 0.13.1", "chrono", @@ -7362,7 +7616,7 @@ dependencies = [ "indexmap", "serde", "serde_json", - "serde_with_macros 2.2.0", + "serde_with_macros 2.3.1", "time", ] @@ -7373,21 +7627,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ "darling 0.13.4", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "serde_with_macros" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1966009f3c05f095697c537312f5415d1e3ed31ce0a56942bac4c771c5c335e" +checksum = "7cbcd6104f8a4ab6af7f6be2a0da6be86b9de3c401f6e86bb856ab2af739232f" dependencies = [ "darling 0.14.2", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -7404,9 +7658,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.17" +version = "0.9.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb06d4b6cdaef0e0c51fa881acb721bed3c924cfaa71d9c94a3b771dfdf6567" +checksum = "d9d684e3ec7de3bf5466b32bd75303ac16f0736426e5a4e0d6e489559ce1249c" dependencies = [ "indexmap", "itoa", @@ -7526,9 +7780,9 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dfecc059e81632eef1dd9b79e22fc28b8fe69b30d3357512a77a0ad8ee3c782" dependencies = [ - "pkcs8", + "pkcs8 0.7.6", "rand_core 0.6.4", - "signature", + "signature 1.6.4", "zeroize", ] @@ -7539,12 +7793,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" [[package]] -name = "simd-abstraction" -version = "0.7.1" +name = "signature" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cadb29c57caadc51ff8346233b5cec1d240b68ce55cf1afc764818791876987" +checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d" dependencies = [ - "outref", + "digest 0.10.6", + "rand_core 0.6.4", ] [[package]] @@ -7573,6 +7828,18 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a30f10c911c0355f80f1c2faa8096efc4a58cdf8590b954d5b395efa071c711" +[[package]] +name = "simple_asn1" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" +dependencies = [ + "num-bigint", + "num-traits", + "thiserror", + "time", +] + [[package]] name = "siphasher" version = "0.3.10" @@ -7656,9 +7923,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "475b3bbe5245c26f2d8a6f62d67c1f30eb9fffeccee721c45d162c3ebbdf81b2" dependencies = [ "heck 0.4.0", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -7698,7 +7965,17 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c01a0c15da1b0b0e1494112e7af814a678fec9bd157881b49beac661e9b6f32" dependencies = [ - "der", + "der 0.4.5", +] + +[[package]] +name = "spki" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +dependencies = [ + "base64ct", + "der 0.6.1", ] [[package]] @@ -7787,9 +8064,9 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ "heck 0.3.3", "proc-macro-error", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -7805,10 +8082,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ "heck 0.4.0", - "proc-macro2 1.0.51", - "quote 1.0.23", + "proc-macro2 1.0.55", + "quote 1.0.26", "rustversion", - "syn 1.0.108", + "syn 1.0.109", ] [[package]] @@ -7840,12 +8117,23 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.108" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56e159d99e6c2b93995d171050271edb50ecc5288fbc7cc17de8fdce4e58c14" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", + "proc-macro2 1.0.55", + "quote 1.0.26", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40" +dependencies = [ + "proc-macro2 1.0.55", + "quote 1.0.26", "unicode-ident", ] @@ -7861,9 +8149,9 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", "unicode-xid 0.2.4", ] @@ -7903,6 +8191,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09a4b0a70bac0a58ca6a7659d1328e34ee462339c70b0fa49f72bad1f278910a" dependencies = [ "cfg-if", + "native-tls", + "rustls-pemfile 1.0.1", ] [[package]] @@ -7913,16 +8203,15 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[package]] name = "tempfile" -version = "3.3.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" dependencies = [ "cfg-if", "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", + "redox_syscall 0.3.5", + "rustix 0.37.5", + "windows-sys 0.45.0", ] [[package]] @@ -7971,41 +8260,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" -[[package]] -name = "test-case" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "679b019fb241da62cc449b33b224d19ebe1c6767b495569765115dd7f7f9fba4" -dependencies = [ - "test-case-macros", -] - -[[package]] -name = "test-case-core" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72dc21b5887f4032c4656502d085dc28f2afbb686f25f216472bb0526f4b1b88" -dependencies = [ - "cfg-if", - "proc-macro-error", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", -] - -[[package]] -name = "test-case-macros" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3786898e0be151a96f730fd529b0e8a10f5990fa2a7ea14e37ca27613c05190" -dependencies = [ - "proc-macro-error", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", - "test-case-core", -] - [[package]] name = "test-generator" version = "0.3.1" @@ -8035,22 +8289,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 2.0.10", ] [[package]] @@ -8148,9 +8402,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.25.0" +version = "1.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" +checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" dependencies = [ "autocfg", "bytes 1.4.0", @@ -8164,7 +8418,7 @@ dependencies = [ "socket2", "tokio-macros", "tracing 0.1.37", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -8194,9 +8448,9 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -8281,18 +8535,6 @@ dependencies = [ "tokio-stream", ] -[[package]] -name = "tokio-tungstenite" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite 0.17.3", -] - [[package]] name = "tokio-tungstenite" version = "0.18.0" @@ -8303,7 +8545,7 @@ dependencies = [ "log", "rustls 0.20.7", "tokio", - "tungstenite 0.18.0", + "tungstenite", ] [[package]] @@ -8313,6 +8555,7 @@ source = "git+https://github.com/vectordotdev/tokio?branch=tokio-util-0.7.4-fram dependencies = [ "bytes 1.4.0", "futures-core", + "futures-io", "futures-sink", "pin-project-lite", "slab", @@ -8331,9 +8574,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7afcae9e3f0fe2c370fd4657108972cbb2fa9db1b9f84849cefd80741b01cb6" +checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" dependencies = [ "serde", "serde_spanned", @@ -8352,15 +8595,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.3" +version = "0.19.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6a7712b49e1775fb9a7b998de6635b299237f48b404dde71704f2e0e7f37e5" +checksum = "08de71aa0d6e348f070457f85af8bd566e2bc452156a423ddf22861b3a953fae" dependencies = [ "indexmap", - "nom8", "serde", "serde_spanned", "toml_datetime", + "winnow", ] [[package]] @@ -8406,10 +8649,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" dependencies = [ "prettyplease", - "proc-macro2 1.0.51", + "proc-macro2 1.0.55", "prost-build", - "quote 1.0.23", - "syn 1.0.108", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -8438,7 +8681,6 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" dependencies = [ - "async-compression", "base64 0.13.1", "bitflags", "bytes 1.4.0", @@ -8448,12 +8690,31 @@ dependencies = [ "http-body", "http-range-header", "pin-project-lite", + "tower", + "tower-layer", + "tower-service", + "tracing 0.1.37", +] + +[[package]] +name = "tower-http" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d1d42a9b3f3ec46ba828e8d376aec14592ea199f70a06a548587ecd1c4ab658" +dependencies = [ + "async-compression", + "bitflags", + "bytes 1.4.0", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite", "tokio", "tokio-util", - "tower", "tower-layer", "tower-service", - "tracing 0.1.37", ] [[package]] @@ -8511,9 +8772,9 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -8551,7 +8812,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "futures 0.3.26", + "futures 0.3.28", "futures-task", "pin-project", "tracing 0.1.37", @@ -8612,7 +8873,6 @@ dependencies = [ "serde", "serde_json", "sharded-slab", - "smallvec", "thread_local", "tracing 0.1.37", "tracing-core 0.1.30", @@ -8620,35 +8880,12 @@ dependencies = [ "tracing-serde", ] -[[package]] -name = "tracing-test" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a2c0ff408fe918a94c428a3f2ad04e4afd5c95bbc08fcf868eff750c15728a4" -dependencies = [ - "lazy_static", - "tracing-core 0.1.30", - "tracing-subscriber", - "tracing-test-macro", -] - -[[package]] -name = "tracing-test-macro" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bc1c4f8e2e73a977812ab339d503e6feeb92700f6d07a6de4d321522d5c08" -dependencies = [ - "lazy_static", - "quote 1.0.23", - "syn 1.0.108", -] - [[package]] name = "tracing-tower" version = "0.1.0" source = "git+https://github.com/tokio-rs/tracing?rev=e0642d949891546a3bb7e47080365ee7274f05cd#e0642d949891546a3bb7e47080365ee7274f05cd" dependencies = [ - "futures 0.3.26", + "futures 0.3.28", "tower-service", "tracing 0.2.0", "tracing-futures 0.3.0", @@ -8752,25 +8989,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "tungstenite" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" -dependencies = [ - "base64 0.13.1", - "byteorder", - "bytes 1.4.0", - "http", - "httparse", - "log", - "rand 0.8.5", - "sha-1", - "thiserror", - "url", - "utf-8", -] - [[package]] name = "tungstenite" version = "0.18.0" @@ -8806,9 +9024,9 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -8819,9 +9037,9 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "typetag" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eecd98403ae5ea2813689125cf5b3f99c40b8abed46c0a8945c81eadb673b31" +checksum = "edc3ebbaab23e6cc369cb48246769d031f5bd85f1b28141f32982e3c0c7b33cf" dependencies = [ "erased-serde", "inventory", @@ -8832,13 +9050,13 @@ dependencies = [ [[package]] name = "typetag-impl" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f9568611f0de5e83e0993b85c54679cd0afd659adcfcb0233f16280b980492e" +checksum = "bb01b60fcc3f5e17babb1a9956263f3ccd2cadc3e52908400231441683283c1d" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 2.0.10", ] [[package]] @@ -8932,9 +9150,9 @@ dependencies = [ [[package]] name = "unsafe-libyaml" -version = "0.2.4" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e5fa573d8ac5f1a856f8d7be41d390ee973daf97c806b2c1a465e4e1406e68" +checksum = "ad2024452afd3874bf539695e04af6732ba06517424dbf958fdb16a01f3bef6c" [[package]] name = "untrusted" @@ -8953,6 +9171,19 @@ dependencies = [ "typenum", ] +[[package]] +name = "ureq" +version = "2.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "338b31dd1314f68f3aabf3ed57ab922df95ffcd902476ca7ba3c4ce7b908c46d" +dependencies = [ + "base64 0.13.1", + "log", + "native-tls", + "once_cell", + "url", +] + [[package]] name = "url" version = "2.3.1" @@ -8989,15 +9220,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom 0.2.8", -] - [[package]] name = "uuid" version = "1.3.0" @@ -9018,20 +9240,20 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value" version = "0.1.0" +source = "git+https://github.com/vectordotdev/vrl?rev=v0.2.0#258cc611080c1bdb5ed6897e8a79b76ab2038fcb" dependencies = [ "async-graphql", "bytes 1.4.0", "chrono", - "indoc", "lookup", "mlua", - "ordered-float 3.4.0", + "ordered-float 3.6.0", "quickcheck", "regex", "serde", "serde_json", "snafu", - "toml 0.7.2", + "toml 0.7.3", "tracing 0.1.37", ] @@ -9048,13 +9270,16 @@ dependencies = [ "anyhow", "atty", "cached", - "clap 4.1.6", + "chrono", + "clap 4.1.14", "clap-verbosity-flag", "clap_complete", "confy", - "directories", + "directories 5.0.0", "dunce", + "glob", "hashlink", + "hex", "indicatif", "itertools", "log", @@ -9062,10 +9287,14 @@ dependencies = [ "os_info", "owo-colors", "paste", + "regex", + "reqwest", "serde", "serde_json", - "serde_yaml 0.9.17", - "toml 0.7.2", + "serde_yaml 0.9.21", + "sha2 0.10.6", + "tempfile", + "toml 0.7.3", ] [[package]] @@ -9076,7 +9305,7 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "vector" -version = "0.28.1" +version = "0.29.1" dependencies = [ "apache-avro", "approx", @@ -9097,11 +9326,11 @@ dependencies = [ "aws-sdk-kinesis", "aws-sdk-s3", "aws-sdk-sqs", - "aws-sigv4 0.53.0", + "aws-sigv4 0.55.0", "aws-smithy-async", "aws-smithy-client", "aws-smithy-http 0.51.0", - "aws-smithy-http-tower 0.54.3", + "aws-smithy-http-tower 0.54.4", "aws-smithy-types 0.51.0", "aws-types", "axum", @@ -9116,12 +9345,12 @@ dependencies = [ "bytesize", "chrono", "cidr-utils", - "clap 4.1.6", + "clap 4.1.14", "codecs", "colored", "console-subscriber", "criterion", - "crossterm 0.26.0", + "crossterm 0.26.1", "csv", "datadog-filter", "datadog-search-syntax", @@ -9136,7 +9365,7 @@ dependencies = [ "fakedata", "file-source", "flate2", - "futures 0.3.26", + "futures 0.3.28", "futures-util", "glob", "goauth", @@ -9156,7 +9385,7 @@ dependencies = [ "hyper-proxy", "indexmap", "indoc", - "infer 0.12.0", + "infer 0.13.0", "inventory", "itertools", "k8s-openapi", @@ -9166,7 +9395,6 @@ dependencies = [ "listenfd", "logfmt", "loki-logproto", - "lookup", "lru", "maxminddb", "md-5", @@ -9182,11 +9410,12 @@ dependencies = [ "num-format", "number_prefix", "once_cell", + "opendal", "openssl", "openssl-probe", "openssl-src", "opentelemetry-proto", - "ordered-float 3.4.0", + "ordered-float 3.6.0", "paste", "percent-encoding", "pin-project", @@ -9209,13 +9438,13 @@ dependencies = [ "rmpv", "roaring", "seahash", - "semver 1.0.16", + "semver 1.0.17", "serde", "serde-toml-merge", "serde_bytes", "serde_json", - "serde_with 2.2.0", - "serde_yaml 0.9.17", + "serde_with 2.3.1", + "serde_yaml 0.9.21", "sha2 0.10.6", "similar-asserts", "smallvec", @@ -9234,13 +9463,13 @@ dependencies = [ "tokio-postgres", "tokio-stream", "tokio-test", - "tokio-tungstenite 0.18.0", + "tokio-tungstenite", "tokio-util", - "toml 0.7.2", + "toml 0.7.3", "tonic", "tonic-build", "tower", - "tower-http", + "tower-http 0.4.0", "tower-test", "tracing 0.1.37", "tracing-core 0.1.30", @@ -9252,7 +9481,7 @@ dependencies = [ "tui", "typetag", "url", - "uuid 1.3.0", + "uuid", "value", "vector-api-client", "vector-buffers", @@ -9261,6 +9490,7 @@ dependencies = [ "vector-config-common", "vector-config-macros", "vector-core", + "vector-lookup", "vector-vrl-functions", "vrl", "vrl-cli", @@ -9278,8 +9508,8 @@ dependencies = [ "anyhow", "async-trait", "chrono", - "clap 4.1.6", - "futures 0.3.26", + "clap 4.1.14", + "futures 0.3.28", "graphql_client", "indoc", "reqwest", @@ -9287,9 +9517,9 @@ dependencies = [ "serde_json", "tokio", "tokio-stream", - "tokio-tungstenite 0.18.0", + "tokio-tungstenite", "url", - "uuid 1.3.0", + "uuid", ] [[package]] @@ -9301,13 +9531,13 @@ dependencies = [ "async-trait", "bytecheck", "bytes 1.4.0", - "clap 4.1.6", + "clap 4.1.14", "crc32fast", "criterion", "crossbeam-queue", "crossbeam-utils", "fslock", - "futures 0.3.26", + "futures 0.3.28", "hdrhistogram", "memmap2", "metrics", @@ -9321,7 +9551,7 @@ dependencies = [ "rand 0.8.5", "rkyv", "serde", - "serde_yaml 0.9.17", + "serde_yaml 0.9.21", "snafu", "temp-dir", "tokio", @@ -9346,11 +9576,11 @@ dependencies = [ "chrono-tz", "crossbeam-utils", "derivative", - "futures 0.3.26", + "futures 0.3.28", "indexmap", "metrics", "nom", - "ordered-float 3.4.0", + "ordered-float 3.6.0", "paste", "pin-project", "quickcheck", @@ -9367,6 +9597,7 @@ dependencies = [ "vector-config", "vector-config-common", "vector-config-macros", + "vrl-core", ] [[package]] @@ -9380,14 +9611,17 @@ dependencies = [ "inventory", "no-proxy", "num-traits", + "pretty_assertions", "serde", "serde_json", - "serde_with 2.2.0", + "serde_with 2.3.1", "snafu", - "toml 0.7.2", + "toml 0.7.3", "url", "vector-config-common", "vector-config-macros", + "vrl-compiler", + "vrl-core", ] [[package]] @@ -9396,11 +9630,11 @@ version = "0.1.0" dependencies = [ "darling 0.13.4", "indexmap", - "proc-macro2 1.0.51", - "quote 1.0.23", + "proc-macro2 1.0.55", + "quote 1.0.26", "serde", "serde_json", - "syn 1.0.108", + "syn 1.0.109", ] [[package]] @@ -9408,11 +9642,12 @@ name = "vector-config-macros" version = "0.1.0" dependencies = [ "darling 0.13.4", - "proc-macro2 1.0.51", - "quote 1.0.23", + "itertools", + "proc-macro2 1.0.55", + "quote 1.0.26", "serde", "serde_derive_internals", - "syn 1.0.108", + "syn 1.0.109", "vector-config", "vector-config-common", ] @@ -9436,13 +9671,12 @@ dependencies = [ "enumflags2", "env-test-util", "float_eq", - "futures 0.3.26", + "futures 0.3.28", "futures-util", "headers", "http", "hyper-proxy", "indexmap", - "lookup", "metrics", "metrics-tracing-context", "metrics-util", @@ -9453,14 +9687,14 @@ dependencies = [ "noisy_float", "once_cell", "openssl", - "ordered-float 3.4.0", + "ordered-float 3.6.0", "parking_lot", "pin-project", "proptest", "prost", "prost-build", "prost-types", - "quanta", + "quanta 0.11.0", "quickcheck", "quickcheck_macros", "rand 0.8.5", @@ -9471,7 +9705,7 @@ dependencies = [ "security-framework", "serde", "serde_json", - "serde_with 2.2.0", + "serde_with 2.3.1", "similar-asserts", "smallvec", "snafu", @@ -9481,7 +9715,7 @@ dependencies = [ "tokio-stream", "tokio-test", "tokio-util", - "toml 0.7.2", + "toml 0.7.3", "tonic", "tower", "tracing 0.1.37", @@ -9497,9 +9731,30 @@ dependencies = [ "vector-config", "vector-config-common", "vector-config-macros", + "vector-lookup", "vrl", ] +[[package]] +name = "vector-lookup" +version = "0.1.0" +dependencies = [ + "lookup", + "serde", + "vector-config", + "vector-config-macros", +] + +[[package]] +name = "vector-vrl-cli" +version = "0.1.0" +dependencies = [ + "clap 4.1.14", + "vector-vrl-functions", + "vrl-cli", + "vrl-stdlib", +] + [[package]] name = "vector-vrl-functions" version = "0.1.0" @@ -9509,6 +9764,46 @@ dependencies = [ "vrl", ] +[[package]] +name = "vector-vrl-tests" +version = "0.1.0" +dependencies = [ + "ansi_term", + "chrono", + "chrono-tz", + "clap 4.1.14", + "enrichment", + "glob", + "lookup", + "prettydiff", + "regex", + "serde", + "serde_json", + "tikv-jemallocator", + "tracing-subscriber", + "value", + "vector-vrl-functions", + "vrl", + "vrl-stdlib", + "vrl-tests", +] + +[[package]] +name = "vector-vrl-web-playground" +version = "0.1.0" +dependencies = [ + "enrichment", + "getrandom 0.2.8", + "gloo-utils", + "serde", + "serde-wasm-bindgen", + "value", + "vector-vrl-functions", + "vrl", + "vrl-stdlib", + "wasm-bindgen", +] + [[package]] name = "version_check" version = "0.9.4" @@ -9524,27 +9819,25 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "vrl" version = "0.1.0" +source = "git+https://github.com/vectordotdev/vrl?rev=v0.2.0#258cc611080c1bdb5ed6897e8a79b76ab2038fcb" dependencies = [ "bytes 1.4.0", - "criterion", "indoc", "lookup", - "ordered-float 3.4.0", - "serde_json", + "ordered-float 3.6.0", "value", - "vector-common", "vrl-compiler", "vrl-core", "vrl-diagnostic", "vrl-parser", - "vrl-stdlib", ] [[package]] name = "vrl-cli" version = "0.1.0" +source = "git+https://github.com/vectordotdev/vrl?rev=v0.2.0#258cc611080c1bdb5ed6897e8a79b76ab2038fcb" dependencies = [ - "clap 4.1.6", + "clap 4.1.14", "exitcode", "indoc", "lookup", @@ -9555,8 +9848,6 @@ dependencies = [ "serde_json", "thiserror", "value", - "vector-common", - "vector-vrl-functions", "vrl", "vrl-core", "vrl-stdlib", @@ -9566,26 +9857,21 @@ dependencies = [ [[package]] name = "vrl-compiler" version = "0.1.0" +source = "git+https://github.com/vectordotdev/vrl?rev=v0.2.0#258cc611080c1bdb5ed6897e8a79b76ab2038fcb" dependencies = [ "anymap", "bytes 1.4.0", "chrono", - "criterion", "dyn-clone", "getrandom 0.2.8", - "indoc", "lalrpop-util", "lookup", - "ordered-float 3.4.0", + "ordered-float 3.6.0", "paste", "regex", "serde", "thiserror", "value", - "vector-common", - "vector-config", - "vector-config-common", - "vector-config-macros", "vrl-core", "vrl-diagnostic", "vrl-parser", @@ -9594,8 +9880,19 @@ dependencies = [ [[package]] name = "vrl-core" version = "0.1.0" +source = "git+https://github.com/vectordotdev/vrl?rev=v0.2.0#258cc611080c1bdb5ed6897e8a79b76ab2038fcb" dependencies = [ + "bytes 1.4.0", + "chrono", + "chrono-tz", + "derivative", "lookup", + "nom", + "ordered-float 3.6.0", + "serde", + "serde_json", + "snafu", + "tracing 0.1.37", "value", "vrl-diagnostic", ] @@ -9603,6 +9900,7 @@ dependencies = [ [[package]] name = "vrl-diagnostic" version = "0.1.0" +source = "git+https://github.com/vectordotdev/vrl?rev=v0.2.0#258cc611080c1bdb5ed6897e8a79b76ab2038fcb" dependencies = [ "codespan-reporting", "termcolor", @@ -9611,14 +9909,13 @@ dependencies = [ [[package]] name = "vrl-parser" version = "0.1.0" +source = "git+https://github.com/vectordotdev/vrl?rev=v0.2.0#258cc611080c1bdb5ed6897e8a79b76ab2038fcb" dependencies = [ - "arbitrary", "lalrpop", "lalrpop-util", "lookup", - "ordered-float 3.4.0", + "ordered-float 3.6.0", "paste", - "test-case", "thiserror", "vrl-diagnostic", ] @@ -9626,9 +9923,9 @@ dependencies = [ [[package]] name = "vrl-stdlib" version = "0.1.0" +source = "git+https://github.com/vectordotdev/vrl?rev=v0.2.0#258cc611080c1bdb5ed6897e8a79b76ab2038fcb" dependencies = [ "aes", - "anyhow", "base16", "base64 0.21.0", "bytes 1.4.0", @@ -9636,9 +9933,7 @@ dependencies = [ "cfb-mode", "charset", "chrono", - "chrono-tz", "cidr-utils", - "criterion", "csv", "ctr", "data-encoding", @@ -9649,6 +9944,7 @@ dependencies = [ "flate2", "grok", "hex", + "hmac", "hostname", "indexmap", "lookup", @@ -9671,15 +9967,14 @@ dependencies = [ "strip-ansi-escapes", "syslog_loose", "tracing 0.1.37", - "tracing-test", "uaparser", "url", "utf8-width", - "uuid 1.3.0", + "uuid", "value", - "vector-common", "vrl", "vrl-core", + "vrl-diagnostic", "woothee", "zstd 0.12.3+zstd.1.5.2", ] @@ -9687,12 +9982,12 @@ dependencies = [ [[package]] name = "vrl-tests" version = "0.1.0" +source = "git+https://github.com/vectordotdev/vrl?rev=v0.2.0#258cc611080c1bdb5ed6897e8a79b76ab2038fcb" dependencies = [ "ansi_term", "chrono", "chrono-tz", - "clap 4.1.6", - "enrichment", + "clap 4.1.14", "glob", "lookup", "prettydiff", @@ -9702,25 +9997,15 @@ dependencies = [ "tikv-jemallocator", "tracing-subscriber", "value", - "vector-common", - "vector-vrl-functions", "vrl", "vrl-stdlib", ] [[package]] -name = "vrl-web-playground" -version = "0.1.0" -dependencies = [ - "getrandom 0.2.8", - "gloo-utils", - "serde", - "serde-wasm-bindgen", - "value", - "vrl", - "vrl-stdlib", - "wasm-bindgen", -] +name = "vsimd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" [[package]] name = "vte" @@ -9739,8 +10024,8 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", + "proc-macro2 1.0.55", + "quote 1.0.26", ] [[package]] @@ -9781,9 +10066,9 @@ dependencies = [ [[package]] name = "warp" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed7b8be92646fc3d18b06147664ebc5f48d222686cb11a8755e561a735aacc6d" +checksum = "27e1a710288f0f91a98dd8a74f05b76a10768db245ce183edf64dc1afdc3016c" dependencies = [ "bytes 1.4.0", "futures-channel", @@ -9796,14 +10081,14 @@ dependencies = [ "mime_guess", "percent-encoding", "pin-project", - "rustls-pemfile 0.2.1", + "rustls-pemfile 1.0.1", "scoped-tls", "serde", "serde_json", "serde_urlencoded", "tokio", "tokio-stream", - "tokio-tungstenite 0.17.2", + "tokio-tungstenite", "tokio-util", "tower-service", "tracing 0.1.37", @@ -9846,9 +10131,9 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", "wasm-bindgen-shared", ] @@ -9870,7 +10155,7 @@ version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ - "quote 1.0.23", + "quote 1.0.26", "wasm-bindgen-macro-support", ] @@ -9880,9 +10165,9 @@ version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -9918,9 +10203,9 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d1fa1e5c829b2bf9eb1e28fb950248b797cd6a04866fbdfa8bc31e5eef4c78" +checksum = "579cc485bd5ce5bfa0d738e4921dd0b956eca9800be1fd2e5257ebe95bc4617e" dependencies = [ "core-foundation", "dirs", @@ -10033,27 +10318,13 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-service" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "917fdb865e7ff03af9dd86609f8767bc88fefba89e8efd569de8e208af8724b3" +checksum = "cd9db37ecb5b13762d95468a2fc6009d4b2c62801243223aabd44fca13ad13c8" dependencies = [ "bitflags", - "err-derive", "widestring 1.0.2", - "windows-sys 0.36.1", -] - -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", + "windows-sys 0.45.0", ] [[package]] @@ -10063,85 +10334,88 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] name = "windows_aarch64_msvc" -version = "0.36.1" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] name = "windows_i686_gnu" -version = "0.36.1" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] name = "windows_i686_msvc" -version = "0.36.1" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] -name = "windows_x86_64_msvc" -version = "0.42.0" +name = "winnow" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "ee7b2c67f962bf5042bfd8b6a916178df33a26eec343ae064cb8e069f638fa6f" +dependencies = [ + "memchr", +] [[package]] name = "winreg" @@ -10162,7 +10436,7 @@ dependencies = [ "async-trait", "base64 0.13.1", "deadpool", - "futures 0.3.26", + "futures 0.3.28", "futures-timer", "http-types", "hyper", @@ -10205,6 +10479,12 @@ dependencies = [ "linked-hash-map", ] +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + [[package]] name = "zerocopy" version = "0.6.1" @@ -10221,9 +10501,9 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6505e6815af7de1746a08f69c69606bb45695a17149517680f3b2149713b19a3" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -10241,9 +10521,9 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.108", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 1.0.109", "synstructure", ] diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 94758156e392..1bf5b6595118 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -17,6 +17,7 @@ , tzdata , cmake , perl +, git # nix has a problem with the `?` in the feature list # enabling kafka will produce a vector with no features at all , enableKafka ? false @@ -33,7 +34,7 @@ let pname = "vector"; - version = "0.28.1"; + version = "0.29.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -42,20 +43,22 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hBEw5sAxex4o/b1nr60dEwZs7nosXU7pUChT1VoI25k="; + sha256 = "sha256-4WqO7i1xthUU2bTzaS5poTh+wemjvqNAUFIDN73f7kw="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "azure_core-0.5.0" = "sha256-fojO7dhntpymMjV58TtYb7N4UN6rOp30D54x09RDXfQ="; - "chrono-0.4.22" = "sha256-c5xHLte0+NpM+UUHEwxu2qdBFUBw62YN9vNkD12llwI="; + "chrono-0.4.24" = "sha256-SVPRfixSt0m14MmOcmBVseC/moj1DIA3B+m0pvT41K0="; + "datadog-filter-0.1.0" = "sha256-CNAIoDyJJo+D2Qzt6Fb2FwpQpzX02XurT8j1gHkz1bE="; "heim-0.1.0-rc.1" = "sha256-ODKEQ1udt7FlxI5fvoFMG7C2zmM45eeEYDUEaLTsdYo="; + "nix-0.26.2" = "sha256-uquYvRT56lhupkrESpxwKEimRFhmYvri10n3dj0f2yg="; "tokio-util-0.7.4" = "sha256-rAzj44O+GOZhG+o6FVN5qCcG/NWxW8fUpScm+xsRjIs="; "tracing-0.2.0" = "sha256-YAxeEofFA43PX2hafh3RY+C81a2v6n1fGzYz2FycC3M="; }; }; - nativeBuildInputs = [ pkg-config cmake perl ]; + nativeBuildInputs = [ pkg-config cmake perl git ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; @@ -106,10 +109,6 @@ rustPlatform.buildRustPackage { postPatch = '' substituteInPlace ./src/dns.rs \ --replace "#[tokio::test]" "" - - ${lib.optionalString (!builtins.elem "transforms-geoip" features) '' - substituteInPlace ./Cargo.toml --replace '"transforms-geoip",' "" - ''} ''; passthru = {