From 4ddb5778a35f1babf779a13adbeabc89f972d605 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 6 May 2023 17:45:28 +0100 Subject: [PATCH 01/40] libbpf: add some key reverse dependencies to passthru.tests --- pkgs/os-specific/linux/libbpf/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index d6bb9d4a431b..75bc6f42d296 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -4,7 +4,12 @@ , stdenv , zlib , lib + +# for passthru.tests +, knot-dns , nixosTests +, systemd +, tracee }: stdenv.mkDerivation rec { @@ -25,7 +30,9 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" "-C src" ]; passthru.tests = { + inherit knot-dns tracee; bpf = nixosTests.bpf; + systemd = systemd.override { withLibBPF = true; }; }; postInstall = '' From 441d248ded81ecfd44b55e09011825599d0d92f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sat, 20 Jan 2024 16:33:01 +1100 Subject: [PATCH 02/40] turbo: 1.10.16 -> 1.11.3 --- pkgs/tools/misc/turbo/default.nix | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/misc/turbo/default.nix b/pkgs/tools/misc/turbo/default.nix index f1216c1fa190..904e89da76ce 100644 --- a/pkgs/tools/misc/turbo/default.nix +++ b/pkgs/tools/misc/turbo/default.nix @@ -4,6 +4,7 @@ , buildGo120Module , git , nodejs +, capnproto , protobuf , protoc-gen-go , protoc-gen-go-grpc @@ -25,12 +26,12 @@ , CoreFoundation }: let - version = "1.10.16"; + version = "1.11.3"; src = fetchFromGitHub { owner = "vercel"; repo = "turbo"; rev = "v${version}"; - sha256 = "sha256-7bEHE/bHRVOXMP7+oo+4k8yn6d+LkXBi8JcDeR0ajww"; + hash = "sha256-hjJXbGct9ZmriKdVjB7gwfmFsV1Tv57V7DfUMFZ8Xv0="; }; ffi = rustPlatform.buildRustPackage { @@ -38,7 +39,7 @@ let inherit src version; cargoBuildFlags = [ "--package" "turborepo-ffi" ]; - cargoHash = "sha256-Mj46yNOYTqt732d7SJ3sAeXbgDkoh7o7S23lKVgpvKY="; + cargoHash = "sha256-3eN8/nBARuaezlzPjAL0YPEPvNqm6jNQAREth8PgcSQ="; RUSTC_BOOTSTRAP = 1; nativeBuildInputs = [ @@ -64,7 +65,8 @@ let pname = "go-turbo"; modRoot = "cli"; - vendorHash = "sha256-8quDuT8VwT3B56jykkbX8ov+DNFZwxPf31+NLdfX1p0="; + proxyVendor = true; + vendorHash = "sha256-JHTg9Gcc0DVdltTGCUaOPSVxL0XVkwPJQm/LoKffU/o="; nativeBuildInputs = [ git @@ -110,22 +112,6 @@ let # expected: env.DetailedMap{All:env.EnvironmentVariableMap(nil), BySource:env.BySource{Explicit:env.EnvironmentVariableMap{}, Matching:env.EnvironmentVariableMap{}}} # actual : env.DetailedMap{All:env.EnvironmentVariableMap{}, BySource:env.BySource{Explicit:env.EnvironmentVariableMap{}, Matching:env.EnvironmentVariableMap{}}} rm ./internal/run/global_hash_test.go - '' + lib.optionalString stdenv.isLinux '' - # filewatcher_test.go:122: got event {/build/TestFileWatching1921149570/001/test-1689172679812 1} - # filewatcher_test.go:122: got event {/build/TestFileWatching1921149570/001/parent/test-1689172679812 1} - # filewatcher_test.go:122: got event {/build/TestFileWatching1921149570/001/parent/child/test-1689172679812 1} - # filewatcher_test.go:122: got event {/build/TestFileWatching1921149570/001/parent/sibling/test-1689172679812 1} - # filewatcher_test.go:127: got event {/build/TestFileWatching1921149570/001/parent/child/foo 1} - # filewatcher_test.go:137: got event {/build/TestFileWatching1921149570/001/parent/sibling/deep 1} - # filewatcher_test.go:141: got event {/build/TestFileWatching1921149570/001/parent/sibling/deep/path 1} - # filewatcher_test.go:146: got event {/build/TestFileWatching1921149570/001/parent/sibling/deep 1} - # filewatcher_test.go:146: Timed out waiting for filesystem event at /build/TestFileWatching1921149570/001/test-1689172679812 - # filewatcher_test.go:146: Timed out waiting for filesystem event at /build/TestFileWatching1921149570/001/parent/test-1689172679812 - # filewatcher_test.go:146: Timed out waiting for filesystem event at /build/TestFileWatching1921149570/001/parent/child/test-1689172679812 - # filewatcher_test.go:146: Timed out waiting for filesystem event at /build/TestFileWatching1921149570/001/parent/sibling/test-1689172679812 - # filewatcher_test.go:146: got event {/build/TestFileWatching1921149570/001/parent/sibling/deep/path/test-1689172679812 1} - # filewatcher_test.go:146: got event {/build/TestFileWatching1921149570/001/parent/sibling/deep/test-1689172679812 1} - rm ./internal/filewatcher/filewatcher_test.go ''; }; @@ -139,13 +125,14 @@ rustPlatform.buildRustPackage { ]; RELEASE_TURBO_CLI = "true"; - cargoHash = "sha256-F+mEDkP7GismosXj+ICJCE4SHhCpWK7FiSyqjJM6LJ4="; + cargoHash = "sha256-bAXO4Lqv4ibo+fz3679MjNgP2MMY8TbxhG0+DRy0xcA="; RUSTC_BOOTSTRAP = 1; nativeBuildInputs = [ pkg-config extra-cmake-modules protobuf + capnproto ]; buildInputs = [ openssl From 425cfc42bd65787cf10b58c1eccdfcf139d985a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 22 Jan 2024 08:50:42 -0800 Subject: [PATCH 03/40] pm2: use buildNpmPackage --- pkgs/by-name/pm/pm2/package.nix | 29 +++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 219 ------------------ pkgs/top-level/all-packages.nix | 2 - 5 files changed, 30 insertions(+), 222 deletions(-) create mode 100644 pkgs/by-name/pm/pm2/package.nix diff --git a/pkgs/by-name/pm/pm2/package.nix b/pkgs/by-name/pm/pm2/package.nix new file mode 100644 index 000000000000..1b29f2fa52dc --- /dev/null +++ b/pkgs/by-name/pm/pm2/package.nix @@ -0,0 +1,29 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "pm2"; + version = "5.3.1"; + + src = fetchFromGitHub { + owner = "Unitech"; + repo = "pm2"; + rev = "v${version}"; + hash = "sha256-thShqrnM5S3/IImEm+2vHVRLCsLJN5NGaSRYubtULW0="; + }; + + npmDepsHash = "sha256-6M8kwiCHaQzcFyUUx7Yax/dobATWXG0Di7enEzlO8YE="; + + dontNpmBuild = true; + + meta = { + changelog = "https://github.com/Unitech/pm2/blob/${src.rev}/CHANGELOG.md"; + description = "Node.js production process manager with a built-in load balancer"; + homepage = "https://github.com/Unitech/pm2"; + license = lib.licenses.agpl3Only; + mainProgram = "pm2"; + maintainers = with lib.maintainers; [ jeremyschlatter ]; + }; +} diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index e541dbad0b5e..a5773558bdbd 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -110,6 +110,7 @@ mapAliases { ocaml-language-server = throw "ocaml-language-server was removed because it was abandoned upstream"; # added 2023-09-04 parcel-bundler = parcel; # added 2023-09-04 pkg = pkgs.vercel-pkg; # added 2023-10-04 + inherit (pkgs) pm2; # added 2024-01-22 prettier_d_slim = pkgs.prettier-d-slim; # added 2023-09-14 inherit (pkgs) pxder; # added 2023-09-26 inherit (pkgs) quicktype; # added 2023-09-09 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 354dbaf2e231..d5b3d3e02435 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -187,7 +187,6 @@ , "peerflix" , "peerflix-server" , {"pgrok-build-deps": "../../tools/networking/pgrok/build-deps"} -, "pm2" , "pnpm" , "poor-mans-t-sql-formatter-cli" , "postcss" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 9997c2fbb2a9..915f9000d0d1 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -92045,225 +92045,6 @@ in bypassCache = true; reconstructLock = true; }; - pm2 = nodeEnv.buildNodePackage { - name = "pm2"; - packageName = "pm2"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pm2/-/pm2-5.3.0.tgz"; - sha512 = "xscmQiAAf6ArVmKhjKTeeN8+Td7ZKnuZFFPw1DGkdFPR/0Iyx+m+1+OpCdf9+HQopX3VPc9/wqPQHqVOfHum9w=="; - }; - dependencies = [ - (sources."@opencensus/core-0.0.9" // { - dependencies = [ - sources."semver-5.7.2" - ]; - }) - (sources."@opencensus/propagation-b3-0.0.8" // { - dependencies = [ - sources."@opencensus/core-0.0.8" - sources."semver-5.7.2" - ]; - }) - (sources."@pm2/agent-2.0.3" // { - dependencies = [ - sources."dayjs-1.8.36" - ]; - }) - (sources."@pm2/io-5.0.2" // { - dependencies = [ - sources."async-2.6.4" - sources."eventemitter2-6.4.9" - sources."tslib-1.9.3" - ]; - }) - (sources."@pm2/js-api-0.6.7" // { - dependencies = [ - sources."async-2.6.4" - sources."eventemitter2-6.4.9" - ]; - }) - sources."@pm2/pm2-version-check-1.0.4" - sources."@tootallnate/quickjs-emscripten-0.23.0" - sources."agent-base-7.1.0" - sources."amp-0.3.1" - sources."amp-message-0.1.2" - sources."ansi-colors-4.1.3" - sources."ansi-styles-4.3.0" - sources."anymatch-3.1.3" - (sources."argparse-1.0.10" // { - dependencies = [ - sources."sprintf-js-1.0.3" - ]; - }) - sources."ast-types-0.13.4" - sources."async-3.2.5" - (sources."async-listener-0.6.10" // { - dependencies = [ - sources."semver-5.7.2" - ]; - }) - sources."axios-0.21.4" - sources."balanced-match-1.0.2" - sources."basic-ftp-5.0.4" - sources."binary-extensions-2.2.0" - sources."blessed-0.1.81" - sources."bodec-0.1.0" - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."buffer-from-1.1.2" - sources."bufferutil-4.0.8" - sources."chalk-3.0.0" - sources."charm-0.1.2" - sources."chokidar-3.5.3" - sources."cli-tableau-2.0.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."commander-2.15.1" - sources."concat-map-0.0.1" - sources."continuation-local-storage-3.2.1" - sources."croner-4.1.97" - sources."culvert-0.1.2" - sources."data-uri-to-buffer-6.0.1" - sources."dayjs-1.11.10" - sources."debug-4.3.4" - sources."degenerator-5.0.1" - sources."emitter-listener-1.1.2" - sources."enquirer-2.3.6" - sources."escape-string-regexp-4.0.0" - sources."escodegen-2.1.0" - sources."esprima-4.0.1" - sources."estraverse-5.3.0" - sources."esutils-2.0.3" - sources."eventemitter2-5.0.1" - sources."fast-json-patch-3.1.1" - sources."fclone-1.0.11" - sources."fill-range-7.0.1" - sources."follow-redirects-1.15.4" - sources."fs-extra-8.1.0" - sources."fs.realpath-1.0.0" - sources."fsevents-2.3.3" - sources."function-bind-1.1.2" - sources."get-uri-6.0.2" - sources."git-node-fs-1.0.0" - sources."git-sha1-0.1.2" - sources."glob-7.2.3" - sources."glob-parent-5.1.2" - sources."graceful-fs-4.2.11" - sources."has-flag-4.0.0" - sources."hasown-2.0.0" - sources."http-proxy-agent-7.0.0" - sources."https-proxy-agent-7.0.2" - sources."iconv-lite-0.4.24" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."ip-1.1.8" - sources."is-binary-path-2.1.0" - sources."is-core-module-2.13.1" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."js-git-0.7.8" - sources."json-stringify-safe-5.0.1" - sources."jsonfile-4.0.0" - sources."lazy-1.0.11" - sources."lodash-4.17.21" - sources."log-driver-1.2.7" - sources."lru-cache-7.18.3" - sources."minimatch-3.1.2" - sources."mkdirp-1.0.4" - sources."module-details-from-path-1.0.3" - sources."ms-2.1.2" - sources."mute-stream-0.0.8" - (sources."needle-2.4.0" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - sources."netmask-2.0.2" - sources."node-gyp-build-4.8.0" - sources."normalize-path-3.0.0" - (sources."nssocket-0.6.0" // { - dependencies = [ - sources."eventemitter2-0.4.14" - ]; - }) - sources."once-1.4.0" - sources."pac-proxy-agent-7.0.1" - sources."pac-resolver-7.0.0" - sources."pako-0.2.9" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" - sources."picomatch-2.3.1" - sources."pidusage-3.0.2" - sources."pm2-axon-4.0.1" - sources."pm2-axon-rpc-0.7.1" - sources."pm2-deploy-1.0.2" - sources."pm2-multimeter-0.1.2" - (sources."pm2-sysmonit-1.2.8" // { - dependencies = [ - sources."pidusage-2.0.21" - ]; - }) - sources."promptly-2.2.0" - sources."proxy-agent-6.3.1" - sources."proxy-from-env-1.1.0" - sources."read-1.0.7" - sources."readdirp-3.6.0" - sources."require-in-the-middle-5.2.0" - sources."resolve-1.22.8" - sources."run-series-1.1.9" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."sax-1.3.0" - (sources."semver-7.5.4" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) - sources."shimmer-1.2.1" - sources."signal-exit-3.0.7" - sources."smart-buffer-4.2.0" - (sources."socks-2.7.1" // { - dependencies = [ - sources."ip-2.0.0" - ]; - }) - sources."socks-proxy-agent-8.0.2" - sources."source-map-0.6.1" - sources."source-map-support-0.5.21" - sources."sprintf-js-1.1.2" - sources."supports-color-7.2.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.21.22" - sources."to-regex-range-5.0.1" - sources."tslib-2.6.2" - sources."tv4-1.3.0" - sources."tx2-1.0.5" - sources."universalify-0.1.2" - sources."utf-8-validate-5.0.10" - sources."uuid-3.4.0" - (sources."vizion-2.2.1" // { - dependencies = [ - sources."async-2.6.4" - ]; - }) - sources."wrappy-1.0.2" - sources."ws-7.4.6" - sources."yallist-4.0.0" - sources."yamljs-0.3.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Production process manager for Node.JS applications with a built-in load balancer."; - homepage = "http://pm2.keymetrics.io/"; - license = "AGPL-3.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e481a780c3ce..a43999168592 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12176,8 +12176,6 @@ with pkgs; plowshare = callPackage ../tools/misc/plowshare { }; - pm2 = nodePackages.pm2; - pmenu = callPackage ../tools/X11/pmenu { }; pngcheck = callPackage ../tools/graphics/pngcheck { }; From 571eb488bd2ef437eaf10f550ed6443239d43c88 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 24 Jan 2024 20:35:47 -0500 Subject: [PATCH 04/40] materialize: 0.17.0 -> 0.84.2 --- pkgs/servers/sql/materialize/Cargo.lock | 8737 ++++++++++++++++----- pkgs/servers/sql/materialize/default.nix | 97 +- pkgs/servers/sql/materialize/npm_deps.nix | 8 +- 3 files changed, 6676 insertions(+), 2166 deletions(-) diff --git a/pkgs/servers/sql/materialize/Cargo.lock b/pkgs/servers/sql/materialize/Cargo.lock index c39f36cadb7a..9af5a20f6450 100644 --- a/pkgs/servers/sql/materialize/Cargo.lock +++ b/pkgs/servers/sql/materialize/Cargo.lock @@ -30,16 +30,18 @@ dependencies = [ [[package]] name = "adler" -version = "0.2.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98" +checksum = "57e6e951cfbb2db8de1828d49073a113a29fd7117b1596caa781a258c7e38d72" dependencies = [ + "cfg-if", + "const-random", "getrandom", "once_cell", "version_check", @@ -47,70 +49,109 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.18" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] [[package]] -name = "ansi_term" -version = "0.12.1" +name = "allocator-api2" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" dependencies = [ - "winapi", + "libc", ] +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + [[package]] name = "anyhow" -version = "1.0.52" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3" +checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" +dependencies = [ + "backtrace", +] [[package]] -name = "arbitrary" -version = "1.0.0" +name = "array-concat" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "698b65a961a9d730fb45b6b0327e20207810c9f61ee421b082b27ba003f49e2b" +checksum = "e9180feb72ccbc07cfe5ef7fa8bbf86ca71490d5dc9ef8ea02c7298ba94e7f7d" [[package]] -name = "arc-swap" -version = "0.4.8" +name = "array-init-cursor" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dabe5a181f83789739c194cbe5a897dde195078fac08568d09221fd6137a7ba8" +checksum = "bf7d0a018de4f6aa429b9d33d69edf69072b1c5b1cb8d3e4a5f7ef898fc3eb76" + +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "arrow-format" -version = "0.3.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7da2d9660bfaebbdb0a44a33b3bd1dcb5a952fafa02c0dfc6a51ea471fef2a" +checksum = "bb83ada98f9d252a3c3642d96c53a357684a87d2e9a753ddf2a30bae20b91790" dependencies = [ - "flatbuffers", + "planus", + "serde", ] [[package]] name = "arrow2" -version = "0.8.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3452b2ae9727464a31a726c07ffec0c0da3b87831610d9ac99fc691c78b3a44" +checksum = "7a4c5b03335bc1cb0fd9f5297f8fd3bbfd6fb04f3cb0bc7d6c91b7128cb8336a" dependencies = [ + "ahash", "arrow-format", - "base64", + "base64 0.13.1", + "bytemuck", "chrono", + "dyn-clone", + "either", + "ethnum", + "fallible-streaming-iterator", + "foreign_vec", "futures", + "getrandom", "hash_hasher", + "multiversion", "num-traits", "parquet2", + "rustc_version", "simdutf8", + "streaming-iterator", ] [[package]] name = "askama" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d8f355701c672c2ba3d718acbd213f740beea577cc4eae66accdffe15be1882" +checksum = "fb98f10f371286b177db5eeb9a6e5396609555686a35e1d4f7b9a9c6d8af0139" dependencies = [ "askama_derive", "askama_escape", @@ -119,47 +160,46 @@ dependencies = [ [[package]] name = "askama_derive" -version = "0.11.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84704cab5b7ae0fd3a9f78ee5eb7b27f3749df445f04623db6633459ae283267" +checksum = "87bf87e6e8b47264efa9bde63d6225c6276a52e05e91bf37eaa8afd0032d6b71" dependencies = [ "askama_shared", "proc-macro2", - "syn", + "syn 1.0.107", ] [[package]] name = "askama_escape" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1bb320f97e6edf9f756bf015900038e43c7700e059688e5724a928c8f3b8d5" +checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341" [[package]] name = "askama_shared" -version = "0.12.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dae03eebba55a2697a376e58b573a29fe36893157173ac8df312ad85f3c0e012" +checksum = "bf722b94118a07fcbc6640190f247334027685d4e218b794dbfe17c32bf38ed0" dependencies = [ "askama_escape", - "humansize", + "mime", + "mime_guess", "nom", - "num-traits", - "percent-encoding", "proc-macro2", "quote", "serde", "serde_json", - "syn", + "syn 1.0.107", "toml", ] [[package]] name = "assert_cmd" -version = "2.0.2" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e996dc7940838b7ef1096b882e29ec30a3149a3a443cdc8dba19ed382eca1fe2" +checksum = "d5c2ca00549910ec251e3bd15f87aeeb206c9456b9a77b43ff6c97c54042a472" dependencies = [ - "bstr", + "bstr 0.2.14", "doc-comment", "predicates", "predicates-core", @@ -169,34 +209,24 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.3.8" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443ccbb270374a2b1055fc72da40e1f237809cd6bb0e97e66d264cd138473a6" +checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" dependencies = [ "flate2", "futures-core", "memchr", "pin-project-lite", "tokio", -] - -[[package]] -name = "async-native-tls" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d57d4cec3c647232e1094dc013546c0b33ce785d8aeb251e1f20dfaf8a9a13fe" -dependencies = [ - "futures-util", - "native-tls", - "thiserror", - "url", + "zstd 0.13.0", + "zstd-safe 7.0.0", ] [[package]] name = "async-stream" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171374e7e3b2504e0e5236e3b59260560f9fe94bfe9ac39ba5e4e929c5590625" +checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" dependencies = [ "async-stream-impl", "futures-core", @@ -204,31 +234,31 @@ dependencies = [ [[package]] name = "async-stream-impl" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "648ed8c8d2ce5409ccd57453d9d1b214b342a0d69376a6feda1fd6cae3299308" +checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] name = "async-trait" -version = "0.1.52" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] name = "asynchronous-codec" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4401f0a3622dad2e0763fa79e0eb328bc70fb7dccfdd645341f00d671247d6" +checksum = "f0de5164e5edbf51c45fb8c2d9664ae1c095cce1b265ecf7569093c0d66ef690" dependencies = [ "bytes", "futures-sink", @@ -243,254 +273,303 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.6", "libc", "winapi", ] [[package]] -name = "autocfg" -version = "1.0.1" +name = "auto_impl" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" - -[[package]] -name = "avro-derive" -version = "0.0.0" +checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89" dependencies = [ + "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] -name = "aws-arn" -version = "0.2.0" +name = "autocfg" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ccc2d8a965d90b82f1517caadd1d261e28bdb3ab78c3fb1c4a44d4686fffa4" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "autotools" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8138adefca3e5d2e73bfba83bd6eeaf904b26a7ac1b4a19892cfe16cc7e1701" dependencies = [ - "lazy_static", - "serde", + "cc", ] [[package]] name = "aws-config" -version = "0.4.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cb6c465279db702be3388e9ee0d8cbc8cfb4b470ad1916981d1a0e2ff26f12d" +checksum = "11382bd8ac4c6c182a9775990935f96c916a865f1414486595f18eb8cfa9d90b" dependencies = [ + "aws-credential-types", "aws-http", + "aws-runtime", + "aws-sdk-sso", + "aws-sdk-ssooidc", "aws-sdk-sts", "aws-smithy-async", - "aws-smithy-client", "aws-smithy-http", - "aws-smithy-http-tower", "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", "bytes", + "fastrand", + "hex", "http", "hyper", + "ring", + "time", "tokio", - "tower", "tracing", + "zeroize", ] [[package]] -name = "aws-endpoint" -version = "0.4.0" +name = "aws-credential-types" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72549a509836fa0dcdc2a4e291f5b3c732ebae1acf6564701e9cb779be43ed01" +checksum = "70a1629320d319dc715c6189b172349186557e209d2a7b893ff3d14efd33a47c" dependencies = [ - "aws-smithy-http", - "aws-types", - "http", - "regex", - "tracing", + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", + "zeroize", ] [[package]] name = "aws-http" -version = "0.4.0" +version = "0.60.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ad8b6cda2e119df93b02a44fc86a1c56294aabd4f4469a299311436b8e9971" +checksum = "30e4199d5d62ab09be6a64650c06cc5c4aa45806fed4c74bc4a5c8eaf039a6fa" dependencies = [ - "aws-smithy-http", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", + "bytes", "http", - "lazy_static", - "percent-encoding", + "http-body", + "pin-project-lite", "tracing", ] [[package]] -name = "aws-sdk-kinesis" -version = "0.4.0" +name = "aws-runtime" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8806c676d5106a992f95b1f3f5bac647fb6a2f22a9fc7faf9d182ab628654739" +checksum = "87116d357c905b53f1828d15366363fd27b330a0393cbef349e653f686d36bad" dependencies = [ - "aws-endpoint", + "aws-credential-types", "aws-http", - "aws-sig-auth", + "aws-sigv4", "aws-smithy-async", - "aws-smithy-client", + "aws-smithy-eventstream", "aws-smithy-http", - "aws-smithy-http-tower", - "aws-smithy-json", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes", + "fastrand", "http", - "tokio-stream", - "tower", + "percent-encoding", + "tracing", + "uuid", ] [[package]] name = "aws-sdk-s3" -version = "0.4.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94c9432a07d9522115a0bc4c338a93585e99bbea2fde17b87c1cdf6e7ce58a06" +checksum = "56e78d98df174c479a7bb6a065a3314ccefe029c0c4a1cc49c0c012eea144264" dependencies = [ - "aws-endpoint", + "aws-credential-types", "aws-http", - "aws-sig-auth", + "aws-runtime", "aws-sigv4", "aws-smithy-async", - "aws-smithy-client", + "aws-smithy-checksums", "aws-smithy-eventstream", "aws-smithy-http", - "aws-smithy-http-tower", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-smithy-xml", "aws-types", "bytes", "http", - "md5", - "tokio-stream", - "tower", + "http-body", + "once_cell", + "percent-encoding", + "regex-lite", + "tracing", + "url", ] [[package]] -name = "aws-sdk-sqs" -version = "0.4.0" +name = "aws-sdk-secretsmanager" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15121818fa602c682df3444451e1abd4f89eb6a3f1af6ee126baadf97951b5b9" +checksum = "09a51b0a0838b8aa5b80677d73ba88e7b05c812540bd44aede473d6e65e712aa" dependencies = [ - "aws-endpoint", + "aws-credential-types", "aws-http", - "aws-sig-auth", + "aws-runtime", "aws-smithy-async", - "aws-smithy-client", "aws-smithy-http", - "aws-smithy-http-tower", - "aws-smithy-query", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "fastrand", + "http", + "once_cell", + "regex-lite", + "tracing", +] + +[[package]] +name = "aws-sdk-sso" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b1779a72c60d45e5699512310d7f6fb965fecc8f7419ce1b993b716f0026fd" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", - "aws-smithy-xml", "aws-types", "bytes", "http", - "tokio-stream", - "tower", + "once_cell", + "regex-lite", + "tracing", +] + +[[package]] +name = "aws-sdk-ssooidc" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ba4a42aa91acecd5ca43b330b5c8eb7f8808d720b6a6f796a35faa302fc73d" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "http", + "once_cell", + "regex-lite", + "tracing", ] [[package]] name = "aws-sdk-sts" -version = "0.4.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82f6ee7e1862da6c1f82222423a5dd19897af8a313b1fdad3016711d3f76d3fd" +checksum = "d27259dcd835b6069260edec09487383f40f45c1cc7f02c74258eff8a22555a4" dependencies = [ - "aws-endpoint", + "aws-credential-types", "aws-http", - "aws-sig-auth", + "aws-runtime", "aws-smithy-async", - "aws-smithy-client", "aws-smithy-http", - "aws-smithy-http-tower", + "aws-smithy-json", "aws-smithy-query", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-smithy-xml", "aws-types", - "bytes", "http", - "tower", -] - -[[package]] -name = "aws-sig-auth" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b92d50e5ec810ecba45cde8b8287cbe670541c65a6d0def0fcda4b6bdf3b6d15" -dependencies = [ - "aws-sigv4", - "aws-smithy-eventstream", - "aws-smithy-http", - "aws-types", - "http", - "thiserror", + "once_cell", + "regex-lite", "tracing", ] [[package]] name = "aws-sigv4" -version = "0.4.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675a411b2afff9272c370a61322ceaae74c3102d70524c145e1d43f389ee5bbb" +checksum = "d222297ca90209dc62245f0a490355795f29de362eb5c19caea4f7f55fe69078" dependencies = [ + "aws-credential-types", "aws-smithy-eventstream", "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", "bytes", "form_urlencoded", "hex", + "hmac", "http", "once_cell", "percent-encoding", - "regex", - "ring", + "sha2", "time", "tracing", ] [[package]] name = "aws-smithy-async" -version = "0.34.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40f1fd575567cb5822e32c2d61aefe2d7afd14d4e49d4879b3efaf5372800de3" +checksum = "1e9f65000917e3aa94c259d67fe01fa9e4cd456187d026067d642436e6311a81" dependencies = [ "futures-util", "pin-project-lite", "tokio", - "tokio-stream", ] [[package]] -name = "aws-smithy-client" -version = "0.34.0" +name = "aws-smithy-checksums" +version = "0.60.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06f2664795a1bb545d651089146f6033d3581ef198d96033a59ca1b2fd0cb6dd" +checksum = "4c2a63681f82fb85ca58d566534b7dc619c782fee0c61c1aa51e2b560c21cb4f" dependencies = [ - "aws-smithy-async", "aws-smithy-http", - "aws-smithy-http-tower", "aws-smithy-types", "bytes", - "fastrand", + "crc32c", + "crc32fast", + "hex", "http", "http-body", - "hyper", - "hyper-tls", - "pin-project", + "md-5", "pin-project-lite", - "tokio", - "tower", + "sha1", + "sha2", "tracing", ] [[package]] name = "aws-smithy-eventstream" -version = "0.34.0" +version = "0.60.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "790716b9e6a8aef428592921efd6d15dfdf556091015e15af6e6e62f9ae42d5f" +checksum = "a85e16fa903c70c49ab3785e5f4ac2ad2171b36e0616f321011fa57962404bb6" dependencies = [ "aws-smithy-types", "bytes", @@ -499,97 +578,199 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.34.0" +version = "0.60.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713ad03f7d51a02e8542d92c8674fb4a3b777acec967eb46018d1776bceca86c" +checksum = "e4e816425a6b9caea4929ac97d0cb33674849bd5f0086418abc0d02c63f7a1bf" dependencies = [ "aws-smithy-eventstream", + "aws-smithy-runtime-api", "aws-smithy-types", "bytes", "bytes-utils", "futures-core", "http", "http-body", - "hyper", + "once_cell", "percent-encoding", - "pin-project", - "tracing", -] - -[[package]] -name = "aws-smithy-http-tower" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2abf5583dbd165d39c1c31f7495c1a5d5cab93e8090689769ff12cc65dd23a71" -dependencies = [ - "aws-smithy-http", - "bytes", - "http", - "http-body", - "pin-project", - "tower", + "pin-project-lite", + "pin-utils", "tracing", ] [[package]] name = "aws-smithy-json" -version = "0.34.0" +version = "0.60.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62d3931e5d170f66a8d84594ebceff66497f2227a4355ac5e25818b547ff9a9b" +checksum = "8ab3f6d49e08df2f8d05e1bb5b68998e1e67b76054d3c43e7b954becb9a5e9ac" dependencies = [ "aws-smithy-types", ] [[package]] name = "aws-smithy-query" -version = "0.34.0" +version = "0.60.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90645f9a051e9d33a8740493c691449bf45acc212797c1316c55ae076e1a0327" +checksum = "0f94a7a3aa509ff9e8b8d80749851d04e5eee0954c43f2e7d6396c4740028737" dependencies = [ "aws-smithy-types", "urlencoding", ] [[package]] -name = "aws-smithy-types" -version = "0.34.0" +name = "aws-smithy-runtime" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7f35e1fc3f0bbd986d45d59d4e41d4f90cbb3762986f580ff0d08e069a8e1a5" +checksum = "8da5b0a3617390e769576321816112f711c13d7e1114685e022505cf51fe5e48" dependencies = [ - "itoa 1.0.1", - "num-integer", - "ryu", - "time", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "fastrand", + "h2", + "http", + "http-body", + "hyper", + "once_cell", + "pin-project-lite", + "pin-utils", + "tokio", + "tracing", ] [[package]] -name = "aws-smithy-xml" -version = "0.34.0" +name = "aws-smithy-runtime-api" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc9be9d70d5884e334cd6a0ceac607953a70be4ec33e75a65fe939cf3b621ad" -dependencies = [ - "thiserror", - "xmlparser", -] - -[[package]] -name = "aws-types" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97cb693d2383f85e22d5b131c9848059dbc552b0ed19121b249a920c71afe752" +checksum = "2404c9eb08bfe9af255945254d9afc69a367b7ee008b8db75c05e3bca485fc65" dependencies = [ "aws-smithy-async", "aws-smithy-types", - "rustc_version", + "bytes", + "http", + "pin-project-lite", + "tokio", "tracing", "zeroize", ] [[package]] -name = "backtrace" -version = "0.3.63" +name = "aws-smithy-types" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6" +checksum = "2aba8136605d14ac88f57dc3a693a9f8a4eab4a3f52bc03ff13746f0cd704e97" +dependencies = [ + "base64-simd", + "bytes", + "bytes-utils", + "futures-core", + "http", + "http-body", + "itoa", + "num-integer", + "pin-project-lite", + "pin-utils", + "ryu", + "serde", + "time", + "tokio", + "tokio-util", +] + +[[package]] +name = "aws-smithy-xml" +version = "0.60.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e8f03926587fc881b12b102048bb04305bf7fb8c83e776f0ccc51eaa2378263" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "aws-types" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e5d5ee29077e0fcd5ddd0c227b521a33aaf02434b7cdba1c55eec5c1f18ac47" +dependencies = [ + "aws-credential-types", + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", + "http", + "rustc_version", + "tracing", +] + +[[package]] +name = "axum" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +dependencies = [ + "async-trait", + "axum-core", + "base64 0.21.5", + "bitflags 1.3.2", + "bytes", + "futures-util", + "headers", + "http", + "http-body", + "hyper", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sha1", + "sync_wrapper", + "tokio", + "tokio-tungstenite", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "backoff" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" +dependencies = [ + "getrandom", + "instant", + "rand", +] + +[[package]] +name = "backtrace" +version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" dependencies = [ "addr2line", "cc", @@ -601,37 +782,39 @@ dependencies = [ ] [[package]] -name = "base64" -version = "0.13.0" +name = "base16ct" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" [[package]] -name = "billing-demo" -version = "0.0.0" +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" + +[[package]] +name = "base64-simd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" dependencies = [ - "anyhow", - "bytes", - "chrono", - "clap", - "csv", - "env_logger", - "futures", - "futures-channel", - "hex", - "mz-protoc", - "ore", - "postgres-types", - "protobuf", - "rand", - "rand_distr", - "test-util", - "tokio", - "tokio-postgres", - "tracing", - "uuid", + "outref", + "vsimd", ] +[[package]] +name = "base64ct" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bdca834647821e0b13d9539a8634eb62d3501b6b6c2cec1722786ee6671b851" + [[package]] name = "bincode" version = "1.3.3" @@ -641,6 +824,42 @@ dependencies = [ "serde", ] +[[package]] +name = "bindgen" +version = "0.65.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" +dependencies = [ + "bitflags 1.3.2", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "prettyplease 0.2.4", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.39", +] + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + [[package]] name = "bitflags" version = "1.3.2" @@ -648,12 +867,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "bitpacking" -version = "0.8.4" +name = "bitflags" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c7d2ac73c167c06af4a5f37e6e59d84148d57ccbe4480b76f0273eefea82d7" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ - "crunchy", + "funty", + "radium", + "tap", + "wyz", ] [[package]] @@ -673,22 +901,49 @@ checksum = "473fc6b38233f9af7baa94fb5852dca389e3d95b8e21c8e3719301462c5d9faf" dependencies = [ "lazy_static", "memchr", - "regex-automata", + "regex-automata 0.1.9", +] + +[[package]] +name = "bstr" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +dependencies = [ + "memchr", + "regex-automata 0.3.9", "serde", ] [[package]] -name = "build-info" -version = "0.0.0" +name = "btoi" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd6407f73a9b8b6162d8a2ef999fe6afd7cc15902ebf42c5cd296addf17e0ad" dependencies = [ - "semver", + "num-traits", +] + +[[package]] +name = "built" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f346b6890a0dfa7266974910e7df2d5088120dd54721b9b0e5aae1ae5e05715" +dependencies = [ + "cargo-lock", ] [[package]] name = "bumpalo" -version = "3.2.1" +version = "3.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ae9db68ad7fac5fe51304d20f016c911539251075a214f8e663babefa35187" +checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" + +[[package]] +name = "bytecount" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" [[package]] name = "bytefmt" @@ -699,6 +954,26 @@ dependencies = [ "regex", ] +[[package]] +name = "bytemuck" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdead85bdec19c194affaeeb670c0e41fe23de31459efd1c174d049269cf02cc" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "562e382481975bc61d11275ac5e62a19abd00b0547d99516a415336f183dcd0e" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + [[package]] name = "byteorder" version = "1.4.3" @@ -707,9 +982,12 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.1.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +dependencies = [ + "serde", +] [[package]] name = "bytes-utils" @@ -722,37 +1000,88 @@ dependencies = [ ] [[package]] -name = "cast" -version = "0.2.2" +name = "bytesize" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427" +checksum = "6c58ec36aac5066d5ca17df51b3e70279f5670a72102f5752cb7e7c856adfc70" [[package]] -name = "cc" -version = "1.0.72" +name = "bzip2-sys" +version = "0.1.11+1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" dependencies = [ - "jobserver", + "cc", + "libc", + "pkg-config", ] [[package]] -name = "ccsr" -version = "0.0.0" +name = "camino" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e" dependencies = [ - "anyhow", - "futures", - "hyper", - "lazy_static", - "mz-http-proxy", - "native-tls", - "openssl", - "reqwest", + "serde", +] + +[[package]] +name = "cargo-lock" +version = "7.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c408da54db4c50d4693f7e649c299bc9de9c23ead86249e5368830bb32a734b" +dependencies = [ + "semver", + "serde", + "toml", + "url", +] + +[[package]] +name = "cargo-platform" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" +dependencies = [ + "camino", + "cargo-platform", + "semver", "serde", "serde_json", - "tokio", - "tracing", - "url", +] + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "jobserver", + "libc", +] + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", ] [[package]] @@ -763,12 +1092,12 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.19" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +checksum = "fdbc37d37da9e5bce8173f3a41b71d9bf3c674deebbaceacd0ebdabde76efb03" dependencies = [ - "libc", - "num-integer", + "android-tzdata", + "iana-time-zone", "num-traits", "serde", "winapi", @@ -776,9 +1105,9 @@ dependencies = [ [[package]] name = "chrono-tz" -version = "0.6.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58549f1842da3080ce63002102d5bc954c7bc843d4f47818e642abdc36253552" +checksum = "fa48fa079165080f11d7753fd0bc175b7d391f276b965fe4b55bfad67856e463" dependencies = [ "chrono", "chrono-tz-build", @@ -789,9 +1118,9 @@ dependencies = [ [[package]] name = "chrono-tz-build" -version = "0.0.2" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db058d493fb2f65f41861bfed7e3fe6335264a9f0f92710cab5bdf01fef09069" +checksum = "d9998fb9f7e9b2111641485bf8beb32f92945f97f92a3d061f744cfef335f751" dependencies = [ "parse-zoneinfo", "phf", @@ -800,17 +1129,61 @@ dependencies = [ ] [[package]] -name = "clap" -version = "3.0.6" +name = "chunked_transfer" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1957aa4a5fb388f0a0a73ce7556c5b42025b874e5cdc2c670775e346e97adec0" +checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e" + +[[package]] +name = "ciborium" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" + +[[package]] +name = "ciborium-ll" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "clang-sys" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa66045b9cb23c2e9c1520732030608b02ee07e5cfaa5a521ec15ded7fa24c90" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "3.2.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eef2b3ded6a26dfaec672a742c93c8cf6b689220324da509ec5caa20de55dc83" dependencies = [ "atty", - "bitflags", + "bitflags 1.3.2", "clap_derive", - "indexmap", - "lazy_static", - "os_str_bytes", + "clap_lex", + "indexmap 1.9.1", + "once_cell", "strsim", "termcolor", "terminal_size", @@ -819,26 +1192,63 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.0.0" +version = "3.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1b9752c030a14235a0bd5ef3ad60a1dcac8468c30921327fc8af36b20c790b9" +checksum = "d756c5824fc5c0c1ee8e36000f576968dbcb2081def956c83fad6f40acd46f96" dependencies = [ "heck", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.107", +] + +[[package]] +name = "clap_lex" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5538cd660450ebeb4234cfecf8f2284b844ffc4c50531e66d584ad5b91293613" +dependencies = [ + "os_str_bytes", ] [[package]] name = "cmake" -version = "0.1.41" +version = "0.1.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c84c596dcf125d6781f58e3f4254677ec2a6d8aa56e8501ac277100990b3229" +checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" dependencies = [ "cc", ] +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "columnation" +version = "0.1.0" +source = "git+https://github.com/MaterializeInc/columnation.git#2cd6d86e5ffabf98aef5cbef09a57f515eae7c55" +dependencies = [ + "paste", +] + +[[package]] +name = "compact_bytes" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de71a0422a777179ab4baef92325e56396443df4a680bc443b11f63d644ca019" +dependencies = [ + "serde", + "static_assertions", +] + [[package]] name = "compile-time-run" version = "0.2.12" @@ -847,116 +1257,97 @@ checksum = "43b5affba7c91c039a483065125dd8c6d4a0985e1e9ac5ab6dffdea4fe4e637f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] name = "connection-string" -version = "0.1.13" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97faeec45f49581c458f8bf81992c5e3ec17d82cda99f59d3cea14eff62698d" -dependencies = [ - "wasm-bindgen", -] +checksum = "510ca239cf13b7f8d16a2b48f263de7b4f8c566f0af58d901031473c76afb1e3" [[package]] name = "console" -version = "0.14.0" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc80946b3480f421c2f17ed1cb841753a371c7c5104f51d507e13f532c856aa" +checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" dependencies = [ "encode_unicode", "lazy_static", "libc", - "terminal_size", - "winapi", + "unicode-width", + "windows-sys 0.42.0", ] [[package]] -name = "coord" -version = "0.0.0" +name = "console-api" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e" dependencies = [ - "anyhow", - "backtrace", - "bincode", - "build-info", - "byteorder", - "ccsr", - "chrono", + "prost", + "prost-types", + "tonic", + "tracing-core", +] + +[[package]] +name = "console-subscriber" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4cf42660ac07fcebed809cfe561dd8730bcd35b075215e6479c516bcd0d11cb" +dependencies = [ + "console-api", "crossbeam-channel", - "datadriven", - "dataflow-types", - "dec", - "derivative", - "differential-dataflow", - "expr", - "fail", + "crossbeam-utils", "futures", - "interchange", - "itertools", - "kafka-util", - "lazy_static", - "log", - "mz-avro", - "mz-aws-util", - "mz-protoc", - "ore", - "persist", - "pgrepr", - "postgres-types", - "postgres-util", - "prometheus", - "protobuf", - "rand", - "rdkafka", - "regex", - "repr", - "rusqlite", - "semver", + "hdrhistogram", + "humantime", + "prost-types", "serde", "serde_json", - "sql", - "sql-parser", - "tempfile", - "timely", + "thread_local", "tokio", - "tokio-postgres", "tokio-stream", + "tonic", "tracing", - "transform", - "uncased", - "url", - "uuid", + "tracing-core", + "tracing-subscriber", ] [[package]] -name = "coordtest" -version = "0.0.0" +name = "const-oid" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" + +[[package]] +name = "const-random" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" dependencies = [ - "anyhow", - "async-trait", - "build-info", - "clap", - "coord", - "datadriven", - "dataflow", - "dataflow-types", - "expr", - "futures", - "ore", - "repr", - "serde_json", - "sql-parser", - "tempfile", - "timely", - "tokio", + "const-random-macro", + "proc-macro-hack", +] + +[[package]] +name = "const-random-macro" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" +dependencies = [ + "getrandom", + "once_cell", + "proc-macro-hack", + "tiny-keccak", ] [[package]] name = "core-foundation" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ "core-foundation-sys", "libc", @@ -964,18 +1355,28 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "core_affinity" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4436406e93f52cce33bfba4be067a9f7229da44a634c385e4b22cdfaca5f84cc" +dependencies = [ + "libc", + "num_cpus", + "winapi", +] [[package]] name = "cpp_demangle" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44919ecaf6f99e8e737bc239408931c9a01e9a6c74814fee8242dd2506b65390" +checksum = "b446fd40bcc17eddd6a4a78f24315eb90afdb3334999ddfd4909985c47722442" dependencies = [ "cfg-if", - "glob", ] [[package]] @@ -988,24 +1389,36 @@ dependencies = [ ] [[package]] -name = "crc32fast" -version = "1.3.0" +name = "crc32c" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836" +checksum = "3dfea2db42e9927a3845fb268a10a72faed6d416065f77873f05e411457c363e" +dependencies = [ + "rustc_version", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ "cfg-if", ] [[package]] name = "criterion" -version = "0.3.5" -source = "git+https://github.com/MaterializeInc/criterion.rs.git#db5acaae4314d3cb194129233689541c15d3935d" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" dependencies = [ + "anes", "atty", "cast", + "ciborium", "clap", "criterion-plot", - "csv", + "futures", "itertools", "lazy_static", "num-traits", @@ -1014,17 +1427,18 @@ dependencies = [ "rayon", "regex", "serde", - "serde_cbor", "serde_derive", "serde_json", "tinytemplate", + "tokio", "walkdir", ] [[package]] name = "criterion-plot" -version = "0.4.4" -source = "git+https://github.com/MaterializeInc/criterion.rs.git#db5acaae4314d3cb194129233689541c15d3935d" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ "cast", "itertools", @@ -1032,9 +1446,9 @@ dependencies = [ [[package]] name = "crossbeam" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845" +checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" dependencies = [ "cfg-if", "crossbeam-channel", @@ -1046,9 +1460,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.2" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", @@ -1056,9 +1470,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -1067,13 +1481,13 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.5" +version = "0.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" +checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" dependencies = [ + "autocfg", "cfg-if", "crossbeam-utils", - "lazy_static", "memoffset", "scopeguard", ] @@ -1090,9 +1504,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120" +checksum = "b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6" dependencies = [ "cfg-if", "lazy_static", @@ -1106,26 +1520,40 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-common" -version = "0.1.0" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567569e659735adb39ff2d4c20600f7cd78be5471f8c58ab162bce3c03fdbc5f" +checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" dependencies = [ "generic-array", + "typenum", ] [[package]] name = "csv" -version = "1.1.6" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad" dependencies = [ - "bstr", "csv-core", - "itoa 0.4.6", + "itoa", "ryu", "serde", ] +[[package]] +name = "csv-async" +version = "1.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71933d3f2d0481d5111cb2817b15b6961961458ec58adf8008194e6c850046f4" +dependencies = [ + "bstr 1.6.0", + "cfg-if", + "csv-core", + "futures", + "tokio", + "tokio-stream", +] + [[package]] name = "csv-core" version = "0.1.10" @@ -1137,19 +1565,63 @@ dependencies = [ [[package]] name = "ctor" -version = "0.1.21" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote", - "syn", + "syn 1.0.107", +] + +[[package]] +name = "cxx" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c949f4e2576a655698463c56dbc5c5ea4c00964becc9adb0458baa943e862a5b" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "618f85c8f132bd8912aab124e15a38adc762bb7e3cef84524adde1692ef3e8bc" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn 1.0.107", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b44dad556b0c83d86676135d6c684bdc2b1b9a1188052dd1cb5998246163536" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acc9305a8b69bc2308c2e17dbb98debeac984cdc89ac550c01507cc129433c3" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", ] [[package]] name = "darling" -version = "0.12.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f2c43f534ea4b0b049015d00269734195e6d3f0f6635cb692251aca6f9f8b3c" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" dependencies = [ "darling_core", "darling_macro", @@ -1157,29 +1629,46 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.12.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e91455b86830a1c21799d94524df0845183fa55bafd9aa137b01c7d1065fa36" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn", + "syn 2.0.39", ] [[package]] name = "darling_macro" -version = "0.12.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29b5acf0dea37a7f66f7b25d2c5e93fd46f8f6968b1a5d7a3e02e97768afc95a" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn", + "syn 2.0.39", ] +[[package]] +name = "dashmap" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8858831f7781322e539ea39e72449c46b059638250c14344fec8d0aa6e539c" +dependencies = [ + "cfg-if", + "num_cpus", + "parking_lot", +] + +[[package]] +name = "data-encoding" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" + [[package]] name = "datadriven" version = "0.6.0" @@ -1191,144 +1680,54 @@ dependencies = [ ] [[package]] -name = "dataflow" -version = "0.0.0" +name = "deadpool" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "421fe0f90f2ab22016f32a9881be5134fdd71c65298917084b0c7477cbc3856e" dependencies = [ - "anyhow", - "async-compression", "async-trait", - "aws-sdk-kinesis", - "aws-sdk-s3", - "aws-sdk-sqs", - "bincode", - "byteorder", - "ccsr", - "chrono", - "crossbeam-channel", - "csv-core", - "dataflow-types", - "dec", - "differential-dataflow", - "dogsdogsdogs", - "enum-iterator", - "expr", - "flate2", - "futures", - "globset", - "inotify", - "interchange", - "itertools", - "kafka-util", - "lazy_static", + "deadpool-runtime", + "num_cpus", + "retain_mut", + "tokio", +] + +[[package]] +name = "deadpool-postgres" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e866e414e9e12fc988f0bfb89a0b86228e7ed196ca509fbc4dcbc738c56e753c" +dependencies = [ + "deadpool", "log", - "mz-avro", - "mz-aws-util", - "mz-protoc", - "ore", - "pdqselect", - "persist", - "persist-types", - "postgres-protocol", - "postgres-util", - "prometheus", - "protobuf", - "pubnub-hyper", - "rand", - "rdkafka", - "regex", - "repr", - "scopeguard", - "serde", - "serde_json", - "tempfile", - "timely", - "timely-util", "tokio", "tokio-postgres", - "tokio-util", - "tracing", - "url", - "uuid", ] [[package]] -name = "dataflow-bin" -version = "0.0.0" +name = "deadpool-runtime" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaa37046cc0f6c3cc6090fbdbf73ef0b8ef4cfcc37f6befc0020f63e8cf121e1" dependencies = [ - "clap", - "ore", - "timely", -] - -[[package]] -name = "dataflow-types" -version = "0.0.0" -dependencies = [ - "anyhow", - "async-trait", - "aws-config", - "aws-smithy-http", - "aws-types", - "ccsr", - "crossbeam-channel", - "enum-iterator", - "enum-kinds", - "expr", - "futures", - "globset", - "http", - "interchange", - "kafka-util", - "mz-aws-util", - "num_enum", - "ore", - "persist", - "persist-types", - "regex", - "repr", - "serde", - "serde_json", - "serde_regex", - "timely", "tokio", - "tracing", - "url", - "uuid", -] - -[[package]] -name = "dataflowd" -version = "0.0.0" -dependencies = [ - "anyhow", - "async-trait", - "clap", - "dataflow", - "dataflow-types", - "futures", - "ore", - "timely", - "tokio", - "tokio-serde", - "tokio-util", - "tracing", - "tracing-subscriber", ] [[package]] name = "debugid" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91cf5a8c2f2097e2a32627123508635d47ce10563d999ec1a95addf08b502ba" +checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ + "serde", "uuid", ] [[package]] name = "dec" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58be07317881c8d6887c3d2e1a73778bf47f4e027d834ae0d105da8bfa3715c8" +checksum = "cbdeb628adfc427c3f926528cf76daf4418453e103151739d48f79b8182cb41f" dependencies = [ "decnumber-sys", "libc", @@ -1346,6 +1745,15 @@ dependencies = [ "libc", ] +[[package]] +name = "der" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" +dependencies = [ + "const-oid", +] + [[package]] name = "derivative" version = "2.2.0" @@ -1354,50 +1762,35 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] -name = "derive_builder" -version = "0.10.2" +name = "derive-getters" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d13202debe11181040ae9063d739fa32cfcaaebe2275fe387703460ae2365b30" +checksum = "7a2c35ab6e03642397cdda1dd58abbc05d418aef8e36297f336d5aba060fe8df" dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66e616858f6187ed828df7c64a6d71720d83767a7f19740b2d1b6fe6327b36e5" -dependencies = [ - "darling", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] -name = "derive_builder_macro" -version = "0.10.2" +name = "diff" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58a94ace95092c5acb1e97a7e846b310cfbd499652f72297da7493f618a98d73" -dependencies = [ - "derive_builder_core", - "syn", -] +checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" [[package]] name = "differential-dataflow" version = "0.12.0" -source = "git+https://github.com/TimelyDataflow/differential-dataflow.git#19808dc71b38d8a0c804ffae96d32868e64b20c1" +source = "git+https://github.com/MaterializeInc/differential-dataflow.git#c5b9baca0283f4d96f7e6f914de8578fb5c521de" dependencies = [ "abomonation", "abomonation_derive", "fnv", "serde", - "serde_derive", "timely", ] @@ -1409,16 +1802,36 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] name = "digest" -version = "0.10.0" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8549e6bfdecd113b7e221fe60b433087f6957387a20f8118ebca9b12af19143d" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer", "crypto-common", - "generic-array", "subtle", ] +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + [[package]] name = "doc-comment" version = "0.3.1" @@ -1428,7 +1841,7 @@ checksum = "923dea538cea0aa3025e8685b20d6ee21ef99c4f77e954a30febbaac5ec73a97" [[package]] name = "dogsdogsdogs" version = "0.1.0" -source = "git+https://github.com/TimelyDataflow/differential-dataflow.git#19808dc71b38d8a0c804ffae96d32868e64b20c1" +source = "git+https://github.com/MaterializeInc/differential-dataflow.git#c5b9baca0283f4d96f7e6f914de8578fb5c521de" dependencies = [ "abomonation", "abomonation_derive", @@ -1439,34 +1852,19 @@ dependencies = [ ] [[package]] -name = "duct" -version = "0.13.3" +name = "dyn-clone" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1607fa68d55be208e83bcfbcfffbc1ec65c9fbcf9eb1a5d548dc3ac0100743b0" -dependencies = [ - "libc", - "once_cell", - "os_pipe", - "shared_child", -] - -[[package]] -name = "educe" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f86b50932a01e7ec5c06160492ab660fb19b6bb2a7878030dd6cd68d21df9d4d" -dependencies = [ - "enum-ordinalize", - "proc-macro2", - "quote", - "syn", -] +checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2" [[package]] name = "either" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +dependencies = [ + "serde", +] [[package]] name = "encode_unicode" @@ -1548,23 +1946,35 @@ dependencies = [ ] [[package]] -name = "enum-iterator" -version = "0.7.0" +name = "enum-as-inner" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eeac5c5edb79e4e39fe8439ef35207780a11f69c52cbe424ce3dfad4cb78de6" +checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "enum-iterator" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91a4ec26efacf4aeff80887a175a419493cb6f8b5480d26387eb0bd038976187" dependencies = [ "enum-iterator-derive", ] [[package]] name = "enum-iterator-derive" -version = "0.7.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159" +checksum = "828de45d0ca18782232dfb8f3ea9cc428e8ced380eb26a520baaacfc70de39ce" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1575,123 +1985,115 @@ checksum = "4e40a16955681d469ab3da85aaa6b42ff656b3c67b52e1d8d3dd36afe97fd462" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] -name = "enum-ordinalize" -version = "3.1.10" +name = "enum_dispatch" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b166c9e378360dd5a6666a9604bb4f54ae0cac39023ffbac425e917a2a04fef" +checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" dependencies = [ - "num-bigint", - "num-traits", + "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] name = "enumflags2" -version = "0.7.1" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8672257d642ffdd235f6e9c723c2326ac1253c8f3c022e7cfd2e57da55b1131" +checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" dependencies = [ "enumflags2_derive", ] [[package]] name = "enumflags2_derive" -version = "0.7.0" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33526f770a27828ce7c2792fdb7cb240220237e0ff12933ed6c23957fc5dd7cf" +checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] -name = "env_logger" -version = "0.9.0" +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ - "atty", - "humantime", + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "error-chain" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" +dependencies = [ + "version_check", +] + +[[package]] +name = "ethnum" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eac3c0b9fa6eb75255ebb42c0ba3e2210d102a66d2795afef6fed668f373311" + +[[package]] +name = "eventsource-client" +version = "0.11.0" +source = "git+https://github.com/MaterializeInc/rust-eventsource-client#fb749fde693a9757289238ee71d4e9b3590fb24b" +dependencies = [ + "futures", + "hyper", + "hyper-timeout", + "hyper-tls", "log", - "regex", - "termcolor", + "pin-project", + "rand", + "tokio", ] [[package]] -name = "error-iter" -version = "0.2.0" +name = "exclusion-set" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e09bfe3000e5aaf2904d2c90e8f38de83dff06731c666d588d382f19da6606a9" - -[[package]] -name = "expr" -version = "0.0.0" +checksum = "9c3708c48ed7245587498d116a41566942d6d9943f5b3207fbf522e2bd0b72d0" dependencies = [ - "aho-corasick", - "anyhow", - "chrono", - "csv", - "datadriven", - "dec", - "encoding", - "enum-iterator", - "expr_test_util", - "hex", - "hmac", - "itertools", - "lowertest", - "md-5", - "num", - "num-iter", - "num_enum", - "ordered-float", - "ore", - "paste", - "pdqselect", - "pgrepr", - "proc-macro2", - "regex", - "regex-syntax", - "repr", - "serde", - "serde_json", - "sha-1", - "sha2", - "uncased", - "uuid", -] - -[[package]] -name = "expr_test_util" -version = "0.0.0" -dependencies = [ - "datadriven", - "expr", - "lazy_static", - "lowertest", - "ore", - "proc-macro2", - "repr", - "repr_test_util", - "serde", - "serde_json", + "loom", ] [[package]] name = "fail" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3245a0ca564e7f3c797d20d833a6870f57a728ac967d5225b3ffdef4465011" +checksum = "fe5e43d0f78a42ad591453aedb1d7ae631ce7ee445c7643691055a9ed8d3b01c" dependencies = [ - "lazy_static", "log", + "once_cell", "rand", ] @@ -1707,6 +2109,16 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" +[[package]] +name = "fancy-regex" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" +dependencies = [ + "bit-set", + "regex", +] + [[package]] name = "fast-float" version = "0.2.0" @@ -1715,12 +2127,9 @@ checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" [[package]] name = "fastrand" -version = "1.5.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b394ed3d285a429378d3b384b9eb1285267e7df4b166df24b7a6939a04dc392e" -dependencies = [ - "instant", -] +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "filetime" @@ -1730,15 +2139,15 @@ checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.10", "winapi", ] [[package]] name = "findshlibs" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d691fdb3f817632d259d09220d4cf0991dbb2c9e59e044a02a59194bf6e14484" +checksum = "40b9e59cd0f7e0806cca4be089683ecb6434e602038df21fe6bf6711b2f07f64" dependencies = [ "cc", "lazy_static", @@ -1747,25 +2156,19 @@ dependencies = [ ] [[package]] -name = "flatbuffers" -version = "2.0.0" +name = "fixedbitset" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4c5738bcd7fad10315029c50026f83c9da5e4a21f8ed66826f43e0e2bde5f6" -dependencies = [ - "bitflags", - "smallvec", - "thiserror", -] +checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e" [[package]] name = "flate2" -version = "1.0.22" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" dependencies = [ - "cfg-if", "crc32fast", - "libc", + "libz-sys", "miniz_oxide", ] @@ -1800,48 +2203,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] -name = "form_urlencoded" -version = "1.0.0" +name = "foreign_vec" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00" +checksum = "ee1b05cbd864bcaecbd3455d6d967862d446e4ebfc3c2e5e5b9841e53cba6673" + +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" dependencies = [ - "matches", "percent-encoding", ] [[package]] name = "fs_extra" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] -name = "fstrings" -version = "0.2.3" +name = "funty" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7845a0f15da505ac36baad0486612dab57f8b8d34e19c5470a265bbcdd572ae6" -dependencies = [ - "fstrings-proc-macro", - "proc-macro-hack", -] - -[[package]] -name = "fstrings-proc-macro" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b58c0e7581dc33478a32299182cbe5ae3b8c028be26728a47fb0a113c92d9d" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "syn", -] +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.19" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4" +checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" dependencies = [ "futures-channel", "futures-core", @@ -1854,9 +2246,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.19" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -1864,15 +2256,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.19" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.19" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a" +checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" dependencies = [ "futures-core", "futures-task", @@ -1881,38 +2273,44 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.19" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-macro" -version = "0.3.19" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] name = "futures-sink" -version = "0.3.19" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.19" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + +[[package]] +name = "futures-timer" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.19" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -1927,12 +2325,16 @@ dependencies = [ ] [[package]] -name = "fuzz" -version = "0.0.1" +name = "generator" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" dependencies = [ - "honggfuzz", - "repr", - "sql-parser", + "cc", + "libc", + "log", + "rustversion", + "windows", ] [[package]] @@ -1956,25 +2358,15 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.1" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4060f4657be78b8e766215b02b18a2e862d83745545de804638e2b545e81aee6" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", -] - -[[package]] -name = "getset" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b328c01a4d71d2d8173daa93562a73ab0fe85616876f02500f53d82948c504" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn", + "wasm-bindgen", ] [[package]] @@ -1985,18 +2377,18 @@ checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd" +checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" dependencies = [ "aho-corasick", - "bstr", + "bstr 0.2.14", "fnv", "log", "regex", @@ -2004,10 +2396,28 @@ dependencies = [ ] [[package]] -name = "h2" -version = "0.3.9" +name = "governor" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f072413d126e57991455e0a922b31e4c8ba7c2ffbebf6b78b4f8521397d65cd" +checksum = "821239e5672ff23e2a7060901fa622950bbd80b649cdaadd78d1c1767ed14eb4" +dependencies = [ + "cfg-if", + "dashmap", + "futures", + "futures-timer", + "no-std-compat", + "nonzero_ext", + "parking_lot", + "quanta", + "rand", + "smallvec", +] + +[[package]] +name = "h2" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" dependencies = [ "bytes", "fnv", @@ -2015,7 +2425,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.1", "slab", "tokio", "tokio-util", @@ -2036,53 +2446,63 @@ checksum = "74721d007512d0cb3338cd20f0654ac913920061a4c4d0d8708edb3f2a698c0c" [[package]] name = "hashbrown" -version = "0.11.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" dependencies = [ "ahash", + "allocator-api2", ] [[package]] -name = "hashlink" -version = "0.7.0" +name = "hdrhistogram" +version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf" +checksum = "6490be71f07a5f62b564bc58e36953f675833df11c7e4a0647bee7a07ca1ec5e" dependencies = [ - "hashbrown", + "base64 0.13.1", + "byteorder", + "flate2", + "nom", + "num-traits", ] [[package]] name = "headers" -version = "0.3.5" -source = "git+https://github.com/MaterializeInc/headers.git#b968d50f79907ea74ad42c8cc83c950314f1ca31" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" dependencies = [ - "base64", - "bitflags", + "base64 0.13.1", + "bitflags 1.3.2", "bytes", "headers-core", "http", "httpdate", "mime", - "sha-1", + "sha1", ] [[package]] name = "headers-core" version = "0.2.0" -source = "git+https://github.com/MaterializeInc/headers.git#b968d50f79907ea74ad42c8cc83c950314f1ca31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ "http", ] [[package]] name = "heck" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" -dependencies = [ - "unicode-segmentation", -] +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" [[package]] name = "hermit-abi" @@ -2093,6 +2513,21 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + [[package]] name = "hex" version = "0.4.3" @@ -2106,41 +2541,59 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" [[package]] -name = "hmac" -version = "0.12.0" +name = "hibitset" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddca131f3e7f2ce2df364b57949a9d47915cfbd35e46cfee355ccebbf794d6a2" +checksum = "f3ede5cfa60c958e60330d65163adbc4211e15a2653ad80eb0cce878de120121" +dependencies = [ + "rayon", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ "digest", ] [[package]] -name = "honggfuzz" -version = "0.5.54" +name = "home" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bea09577d948a98a5f59b7c891e274c4fb35ad52f67782b3d0cb53b9c05301f1" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "arbitrary", - "lazy_static", - "memmap", + "windows-sys 0.48.0", +] + +[[package]] +name = "hostname" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +dependencies = [ + "libc", + "match_cfg", + "winapi", ] [[package]] name = "http" -version = "0.2.6" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", - "itoa 1.0.1", + "itoa", ] [[package]] name = "http-body" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", "http", @@ -2148,34 +2601,34 @@ dependencies = [ ] [[package]] -name = "httparse" -version = "1.5.1" +name = "http-range-header" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" +checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05842d0d43232b23ccb7060ecb0f0626922c21f30012e97b767b30afd4a5d4b9" - -[[package]] -name = "humansize" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "humantime" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.16" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7ec3e62bdc98a2f0393a5048e4c30ef659440ea6e0e572965103e72bd836f55" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -2186,9 +2639,9 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 0.4.6", + "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -2197,9 +2650,9 @@ dependencies = [ [[package]] name = "hyper-openssl" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d52322a69f0a93f177d76ca82073fcec8d5b4eb6e28525d5b3142fa718195c" +checksum = "d6ee5d7a8f718585d1c3c61dfde28ef5b0bb14734b4db13f5ada856cdc6c612b" dependencies = [ "http", "hyper", @@ -2214,21 +2667,15 @@ dependencies = [ ] [[package]] -name = "hyper-proxy" -version = "0.9.1" +name = "hyper-timeout" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc" +checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "bytes", - "futures", - "headers", - "http", "hyper", - "hyper-tls", - "native-tls", + "pin-project-lite", "tokio", - "tokio-native-tls", - "tower-service", + "tokio-io-timeout", ] [[package]] @@ -2244,6 +2691,20 @@ dependencies = [ "tokio-native-tls", ] +[[package]] +name = "iana-time-zone" +version = "0.1.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c495f162af0bf17656d0014a0eded5f3cd2f365fdd204548c2869db89359dc7" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "js-sys", + "once_cell", + "wasm-bindgen", + "winapi", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -2252,20 +2713,19 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] [[package]] name = "include_dir" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "482a2e29200b7eed25d7fdbd14423326760b7f6658d21a4cf12d55a50713c69f" +checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" dependencies = [ "include_dir_macros", ] @@ -2282,128 +2742,90 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.7.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", ] [[package]] name = "indicatif" -version = "0.16.2" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b" +checksum = "4295cbb7573c16d310e99e713cf9e75101eb190ab31fccd35f2d2691b4352b19" +dependencies = [ + "console", + "number_prefix", + "portable-atomic", + "unicode-width", +] + +[[package]] +name = "insta" +version = "1.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aa511b2e298cd49b1856746f6bb73e17036bcd66b25f5e92cdcdbec9bd75686" dependencies = [ "console", "lazy_static", - "number_prefix", - "regex", -] - -[[package]] -name = "inotify" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf888f9575c290197b2c948dc9e9ff10bd1a39ad1ea8585f734585fa6b9d3f9" -dependencies = [ - "bitflags", - "futures-core", - "inotify-sys", - "libc", - "tokio", -] - -[[package]] -name = "inotify-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4563555856585ab3180a5bf0b2f9f8d301a728462afffc8195b3f5394229c55" -dependencies = [ - "libc", + "linked-hash-map", + "similar", + "yaml-rust", ] [[package]] name = "instant" -version = "0.1.6" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b141fdc7836c525d4d594027d318c84161ca17aaf8113ab1f81ab93ae897485" - -[[package]] -name = "integer-encoding" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90c11140ffea82edce8dcd74137ce9324ec24b3cf0175fc9d7e29164da9915b8" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "async-trait", - "futures-util", + "cfg-if", ] [[package]] -name = "interchange" -version = "0.0.0" +name = "io-lifetimes" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" dependencies = [ - "anyhow", - "avro-derive", - "base64", - "byteorder", - "ccsr", - "chrono", - "criterion", - "dec", - "differential-dataflow", - "futures", - "hex", - "itertools", - "lazy_static", - "mz-avro", - "mz-protoc", - "num-traits", - "ordered-float", - "ore", - "protobuf", - "regex", - "repr", - "serde", - "serde_json", - "sha2", - "smallvec", - "sql-parser", - "tempfile", - "timely", - "tokio", - "tracing", - "url", - "uuid", + "hermit-abi 0.3.1", + "libc", + "windows-sys 0.48.0", ] [[package]] name = "ipnet" -version = "2.3.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" +checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" [[package]] name = "itertools" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ "either", ] [[package]] name = "itoa" -version = "0.4.6" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" - -[[package]] -name = "itoa" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jobserver" @@ -2416,60 +2838,241 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.51" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] [[package]] -name = "json" -version = "0.12.4" +name = "json-patch" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" +checksum = "1f54898088ccb91df1b492cc80029a6fdf1c48ca0db7c6822a8babad69c94658" +dependencies = [ + "serde", + "serde_json", + "thiserror", + "treediff", +] [[package]] -name = "json-flattened-view-gen" -version = "0.1.0" +name = "jsonpath_lib" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaa63191d68230cccb81c5aa23abd53ed64d83337cacbb25a7b8c7979523774f" dependencies = [ - "anyhow", - "clap", - "ore", + "log", "serde", "serde_json", ] [[package]] -name = "kafka-util" -version = "0.0.0" +name = "jsonwebtoken" +version = "9.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7ea04a7c5c055c175f189b6dc6ba036fd62306b58c66c9f6389036c503a3f4" dependencies = [ - "anyhow", - "ccsr", + "base64 0.21.5", + "js-sys", + "pem", + "ring", + "serde", + "serde_json", + "simple_asn1", +] + +[[package]] +name = "junit-report" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06c3a3342e6720a82d7d179f380e9841b73a1dd49344e33959fdfe571ce56b55" +dependencies = [ + "derive-getters", + "quick-xml", + "strip-ansi-escapes", + "time", +] + +[[package]] +name = "k8s-openapi" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edc3606fd16aca7989db2f84bb25684d0270c6d6fa1dbcd0025af7b4130523a6" +dependencies = [ + "base64 0.21.5", + "bytes", "chrono", - "clap", - "crossbeam", - "futures", - "mz-avro", - "num_cpus", - "ore", - "rand", - "rdkafka", + "schemars", "serde", + "serde-value", "serde_json", - "tokio", - "tracing", - "url", ] [[package]] -name = "krb5-src" -version = "0.3.1+1.19.2" +name = "keyed_priority_queue" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57fe5be675c272d885d49be528b3b048e38974a0579b0e691da2fb3f3c41eaca" +checksum = "2d63b6407b66fc81fc539dccf3ddecb669f393c5101b6a2be3976c95099a06e8" dependencies = [ - "duct", - "openssl-sys", + "indexmap 1.9.1", +] + +[[package]] +name = "kube" +version = "0.87.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e34392aea935145070dcd5b39a6dea689ac6534d7d117461316c3d157b1d0fc3" +dependencies = [ + "k8s-openapi", + "kube-client", + "kube-core", + "kube-derive", + "kube-runtime", +] + +[[package]] +name = "kube-client" +version = "0.87.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7266548b9269d9fa19022620d706697e64f312fb2ba31b93e6986453fcc82c92" +dependencies = [ + "base64 0.21.5", + "bytes", + "chrono", + "either", + "futures", + "home", + "http", + "http-body", + "hyper", + "hyper-openssl", + "hyper-timeout", + "jsonpath_lib", + "k8s-openapi", + "kube-core", + "openssl", + "pem", + "pin-project", + "rand", + "secrecy", + "serde", + "serde_json", + "serde_yaml", + "thiserror", + "tokio", + "tokio-tungstenite", + "tokio-util", + "tower", + "tower-http", + "tracing", +] + +[[package]] +name = "kube-core" +version = "0.87.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8321c315b96b59f59ef6b33f604b84b905ab8f9ff114a4f909d934c520227b1" +dependencies = [ + "chrono", + "form_urlencoded", + "http", + "json-patch", + "k8s-openapi", + "once_cell", + "schemars", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "kube-derive" +version = "0.87.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54591e1f37fc329d412c0fdaced010cc1305b546a39f283fc51700f8fb49421" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "serde_json", + "syn 2.0.39", +] + +[[package]] +name = "kube-runtime" +version = "0.87.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e511e2c1a368d9d4bf6e70db58197e535d818df355b5a2007a8aeb17a370a8ba" +dependencies = [ + "ahash", + "async-trait", + "backoff", + "derivative", + "futures", + "hashbrown 0.14.0", + "json-patch", + "k8s-openapi", + "kube-client", + "parking_lot", + "pin-project", + "serde", + "serde_json", + "smallvec", + "thiserror", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "launchdarkly-server-sdk" +version = "1.0.0" +source = "git+https://github.com/MaterializeInc/rust-server-sdk#df1440c8b93a192d50470d1b258615febe52f1f8" +dependencies = [ + "built", + "chrono", + "crossbeam-channel", + "data-encoding", + "eventsource-client", + "futures", + "hyper", + "hyper-tls", + "launchdarkly-server-sdk-evaluation", + "lazy_static", + "log", + "lru", + "moka", + "parking_lot", + "ring", + "serde", + "serde_json", + "thiserror", + "tokio", + "tokio-stream", + "uuid", +] + +[[package]] +name = "launchdarkly-server-sdk-evaluation" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c27dd31ce69c55fca526d1c22c2dcca96fd0c98e496529d37eeef6c41652173" +dependencies = [ + "base16ct", + "chrono", + "itertools", + "lazy_static", + "log", + "maplit", + "regex", + "semver", + "serde", + "serde_json", + "serde_with", + "sha1", + "urlencoding", ] [[package]] @@ -2479,33 +3082,60 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] -name = "libc" -version = "0.2.112" +name = "lazycell" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] -name = "libm" -version = "0.2.1" +name = "lgalloc" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" - -[[package]] -name = "libsqlite3-sys" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abd5850c449b40bacb498b2bbdfaff648b1b055630073ba8db499caf2d0ea9f2" +checksum = "04e800ee9a186dfd634b56aac0814ab6281f87c962bc63087361fa73442e30e1" dependencies = [ + "crossbeam-deque", + "libc", + "memmap2", + "tempfile", + "thiserror", +] + +[[package]] +name = "libc" +version = "0.2.148" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" + +[[package]] +name = "libloading" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "librocksdb-sys" +version = "0.11.0+8.3.2" +source = "git+https://github.com/MaterializeInc/rust-rocksdb?branch=master#3305d514d509c6b95b0c925c78157e5e4ae4b7ba" +dependencies = [ + "bindgen", + "bzip2-sys", "cc", - "pkg-config", - "vcpkg", + "glob", + "libc", + "libz-sys", + "lz4-sys", + "zstd-sys", ] [[package]] name = "libz-sys" -version = "1.1.2" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655" +checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" dependencies = [ "cc", "libc", @@ -2514,10 +3144,19 @@ dependencies = [ ] [[package]] -name = "linked-hash-map" -version = "0.5.4" +name = "link-cplusplus" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" +checksum = "f8cae2cd7ba2f3f63938b9c724475dfb7b9861b545a90324476324ed21dbc8c8" +dependencies = [ + "cc", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linked_hash_set" @@ -2529,44 +3168,87 @@ dependencies = [ ] [[package]] -name = "lock_api" -version = "0.4.2" +name = "linux-raw-sys" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" +checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf" + +[[package]] +name = "linux-raw-sys" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" + +[[package]] +name = "lock_api" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" dependencies = [ "scopeguard", ] [[package]] name = "log" -version = "0.4.14" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if", ] [[package]] -name = "lowertest" -version = "0.0.0" +name = "loom" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" dependencies = [ - "anyhow", - "datadriven", - "lazy_static", - "lowertest-derive", - "ore", - "proc-macro2", - "serde", - "serde_json", + "cfg-if", + "generator", + "scoped-tls", + "tracing", + "tracing-subscriber", ] [[package]] -name = "lowertest-derive" -version = "0.0.0" +name = "lru" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efa59af2ddfad1854ae27d75009d538d0998b4b2fd47083e743ac1a10e46c60" dependencies = [ - "proc-macro2", - "quote", - "syn", + "hashbrown 0.14.0", +] + +[[package]] +name = "lsp-types" +version = "0.94.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1" +dependencies = [ + "bitflags 1.3.2", + "serde", + "serde_json", + "serde_repr", + "url", +] + +[[package]] +name = "lz4-sys" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "mach2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" +dependencies = [ + "libc", ] [[package]] @@ -2575,13 +3257,19 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" +[[package]] +name = "match_cfg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + [[package]] name = "matchers" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "regex-automata", + "regex-automata 0.1.9", ] [[package]] @@ -2591,177 +3279,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] -name = "materialized" -version = "0.17.0" -dependencies = [ - "anyhow", - "askama", - "askama_shared", - "assert_cmd", - "async-trait", - "atty", - "backtrace", - "build-info", - "bytes", - "cc", - "cfg-if", - "chrono", - "clap", - "compile-time-run", - "coord", - "coordtest", - "crossbeam-channel", - "datadriven", - "dataflow", - "dataflow-types", - "dataflowd", - "differential-dataflow", - "fail", - "fallible-iterator", - "flate2", - "futures", - "hex", - "hex-literal", - "hyper", - "hyper-openssl", - "include_dir", - "itertools", - "kafka-util", - "krb5-src", - "lazy_static", - "libc", - "mz-http-proxy", - "mz-process-collector", - "nix", - "num_cpus", - "openssl", - "openssl-sys", - "ore", - "os_info", - "pgrepr", - "pgtest", - "pgwire", - "pid-file", - "postgres", - "postgres-openssl", - "postgres-protocol", - "postgres_array", - "predicates", - "prof", - "prometheus", - "rand", - "rdkafka-sys", - "repr", - "reqwest", - "rlimit", - "semver", - "serde", - "serde_json", - "sha2", - "shell-words", - "sql", - "sysctl", - "sysinfo", - "tar", - "tempfile", - "tikv-jemallocator", - "timely", - "tokio", - "tokio-openssl", - "tokio-postgres", - "tokio-stream", - "tracing", - "tracing-subscriber", - "url", - "uuid", - "walkdir", -] - -[[package]] -name = "mbta-to-mtrlz" -version = "0.0.0" -dependencies = [ - "anyhow", - "byteorder", - "clap", - "futures", - "json", - "ordered-float", - "ore", - "rdkafka", - "repr", - "serde_json", - "test-util", - "tokio", -] +name = "matchit" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" [[package]] name = "md-5" -version = "0.10.0" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6a38fc55c8bbc10058782919516f88826e70320db6d206aebc49611d24216ae" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" dependencies = [ "digest", ] -[[package]] -name = "md5" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" - [[package]] name = "memchr" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] -name = "memmap" -version = "0.7.0" +name = "memmap2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" +checksum = "d5172b50c23043ff43dd53e51392f36519d9b35a8f3a410d30ece5d1aedd58ae" dependencies = [ "libc", - "winapi", ] [[package]] name = "memoffset" -version = "0.6.4" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" dependencies = [ "autocfg", ] -[[package]] -name = "metabase" -version = "0.0.0" -dependencies = [ - "reqwest", - "serde", - "serde_json", -] - -[[package]] -name = "metabase-smoketest" -version = "0.0.0" -dependencies = [ - "anyhow", - "itertools", - "metabase", - "ore", - "tokio", - "tokio-postgres", - "tracing", -] - [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" @@ -2781,38 +3341,315 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f" +checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.7.11" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "log", - "miow", - "ntapi", - "winapi", + "wasi", + "windows-sys 0.48.0", ] [[package]] -name = "miow" -version = "0.3.7" +name = "moka" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" +checksum = "7b49a05f67020456541f4f29cbaa812016a266a86ec76f96d3873d459c68fe5e" dependencies = [ - "winapi", + "crossbeam-channel", + "crossbeam-epoch", + "crossbeam-utils", + "num_cpus", + "once_cell", + "parking_lot", + "rustc_version", + "scheduled-thread-pool", + "skeptic", + "smallvec", + "tagptr", + "thiserror", + "triomphe", + "uuid", +] + +[[package]] +name = "multimap" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" + +[[package]] +name = "multiversion" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "025c962a3dd3cc5e0e520aa9c612201d127dcdf28616974961a649dca64f5373" +dependencies = [ + "multiversion-macros", +] + +[[package]] +name = "multiversion-macros" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8a3e2bde382ebf960c1f3e79689fa5941625fe9bf694a1cb64af3e85faff3af" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "mysql_async" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6750b17ce50f8f112ef1a8394121090d47c596b56a6a17569ca680a9626e2ef2" +dependencies = [ + "bytes", + "crossbeam", + "flate2", + "futures-core", + "futures-sink", + "futures-util", + "keyed_priority_queue", + "lazy_static", + "lru", + "mio", + "mysql_common", + "once_cell", + "pem", + "percent-encoding", + "pin-project", + "rand", + "serde", + "serde_json", + "socket2 0.5.3", + "thiserror", + "tokio", + "tokio-util", + "tracing", + "twox-hash", + "url", +] + +[[package]] +name = "mysql_common" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06f19e4cfa0ab5a76b627cec2d81331c49b034988eaf302c3bafeada684eadef" +dependencies = [ + "base64 0.21.5", + "bindgen", + "bitflags 2.4.1", + "bitvec", + "btoi", + "byteorder", + "bytes", + "cc", + "cmake", + "crc32fast", + "flate2", + "lazy_static", + "num-bigint", + "num-traits", + "rand", + "regex", + "saturating", + "serde", + "serde_json", + "sha1", + "sha2", + "smallvec", + "subprocess", + "thiserror", + "uuid", + "zstd 0.12.4", +] + +[[package]] +name = "mz" +version = "0.3.0" +dependencies = [ + "assert_cmd", + "axum", + "clap", + "csv", + "dirs", + "hyper", + "indicatif", + "maplit", + "mz-build-info", + "mz-cloud-api", + "mz-frontegg-auth", + "mz-frontegg-client", + "mz-ore", + "once_cell", + "open", + "openssl-probe", + "reqwest", + "rpassword", + "security-framework", + "semver", + "serde", + "serde-aux", + "serde_json", + "tabled", + "termcolor", + "thiserror", + "time", + "tokio", + "toml", + "toml_edit", + "url", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-adapter" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "bytes", + "bytesize", + "chrono", + "criterion", + "datadriven", + "deadpool-postgres", + "dec", + "derivative", + "differential-dataflow", + "enum-kinds", + "fail", + "futures", + "governor", + "hex", + "http", + "itertools", + "launchdarkly-server-sdk", + "maplit", + "mz-adapter-types", + "mz-audit-log", + "mz-build-info", + "mz-catalog", + "mz-ccsr", + "mz-cloud-resources", + "mz-cluster-client", + "mz-compute-client", + "mz-compute-types", + "mz-controller", + "mz-controller-types", + "mz-expr", + "mz-kafka-util", + "mz-orchestrator", + "mz-ore", + "mz-persist-client", + "mz-persist-types", + "mz-pgcopy", + "mz-pgrepr", + "mz-pgwire-common", + "mz-postgres-client", + "mz-postgres-util", + "mz-prof", + "mz-proto", + "mz-repr", + "mz-rocksdb-types", + "mz-secrets", + "mz-segment", + "mz-service", + "mz-sql", + "mz-sql-parser", + "mz-ssh-util", + "mz-stash", + "mz-storage-client", + "mz-storage-types", + "mz-timestamp-oracle", + "mz-tls-util", + "mz-tracing", + "mz-transform", + "once_cell", + "opentelemetry", + "prometheus", + "proptest", + "proptest-derive", + "prost", + "qcell", + "rand", + "rand_chacha", + "rdkafka", + "regex", + "reqwest", + "semver", + "serde", + "serde_json", + "serde_plain", + "smallvec", + "static_assertions", + "thiserror", + "timely", + "tokio", + "tokio-postgres", + "tokio-stream", + "tracing", + "tracing-core", + "tracing-opentelemetry", + "tracing-subscriber", + "uncased", + "url", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-adapter-types" +version = "0.0.0" +dependencies = [ + "mz-ore", + "mz-repr", + "mz-storage-types", + "serde", + "timely", + "workspace-hack", +] + +[[package]] +name = "mz-alloc" +version = "0.0.0" +dependencies = [ + "mz-ore", + "mz-prof", + "mz-prof-http", + "tikv-jemallocator", + "workspace-hack", +] + +[[package]] +name = "mz-audit-log" +version = "0.0.0" +dependencies = [ + "anyhow", + "mz-ore", + "proptest", + "proptest-derive", + "serde", + "serde_json", + "serde_plain", + "workspace-hack", ] [[package]] name = "mz-avro" -version = "0.6.5" +version = "0.7.0" dependencies = [ "anyhow", "byteorder", @@ -2822,8 +3659,8 @@ dependencies = [ "enum-kinds", "flate2", "itertools", - "lazy_static", - "md-5", + "mz-ore", + "once_cell", "rand", "regex", "serde", @@ -2832,96 +3669,2521 @@ dependencies = [ "snap", "tracing", "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-avro-derive" +version = "0.0.0" +dependencies = [ + "quote", + "syn 1.0.107", + "workspace-hack", +] + +[[package]] +name = "mz-aws-secrets-controller" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "aws-config", + "aws-credential-types", + "aws-sdk-secretsmanager", + "aws-types", + "futures", + "mz-aws-util", + "mz-repr", + "mz-secrets", + "tracing", + "workspace-hack", ] [[package]] name = "mz-aws-util" version = "0.0.0" dependencies = [ - "anyhow", "aws-config", - "aws-sdk-kinesis", "aws-sdk-s3", - "aws-sdk-sqs", - "aws-sdk-sts", - "aws-smithy-client", - "aws-smithy-http", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-types", - "hyper", - "mz-http-proxy", + "hyper-tls", + "workspace-hack", ] [[package]] -name = "mz-http-proxy" -version = "0.1.0" +name = "mz-balancerd" +version = "0.84.2" dependencies = [ + "anyhow", + "async-trait", + "axum", + "bytes", + "bytesize", + "clap", + "futures", + "hyper", + "hyper-openssl", + "jsonwebtoken", + "mz-build-info", + "mz-environmentd", + "mz-frontegg-auth", + "mz-frontegg-mock", + "mz-http-util", + "mz-orchestrator-tracing", + "mz-ore", + "mz-pgwire-common", + "mz-server-core", + "num_cpus", + "openssl", + "postgres", + "prometheus", + "semver", + "tokio", + "tokio-openssl", + "tokio-postgres", + "tokio-util", + "tracing", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-build-info" +version = "0.0.0" +dependencies = [ + "compile-time-run", + "semver", + "workspace-hack", +] + +[[package]] +name = "mz-catalog" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "base64 0.13.1", + "bytes", + "bytesize", + "chrono", + "derivative", + "differential-dataflow", + "fail", + "futures", + "insta", + "itertools", + "md-5", + "mz-adapter-types", + "mz-audit-log", + "mz-build-info", + "mz-cloud-resources", + "mz-compute-client", + "mz-controller", + "mz-controller-types", + "mz-expr", + "mz-orchestrator", + "mz-ore", + "mz-persist-client", + "mz-persist-types", + "mz-pgrepr", + "mz-pgtz", + "mz-postgres-util", + "mz-proto", + "mz-repr", + "mz-secrets", + "mz-sql", + "mz-sql-parser", + "mz-stash", + "mz-stash-types", + "mz-storage-client", + "mz-storage-types", + "once_cell", + "paste", + "postgres-openssl", + "prometheus", + "proptest", + "proptest-derive", + "prost", + "prost-build", + "protobuf-src", + "rand", + "serde", + "serde_json", + "serde_plain", + "sha2", + "similar-asserts", + "static_assertions", + "thiserror", + "timely", + "tokio", + "tokio-postgres", + "tracing", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-catalog-debug" +version = "0.84.2" +dependencies = [ + "anyhow", + "clap", + "mz-adapter", + "mz-build-info", + "mz-catalog", + "mz-ore", + "mz-persist-client", + "mz-secrets", + "mz-sql", + "mz-stash", + "mz-storage-types", + "mz-tls-util", + "once_cell", + "serde", + "serde_json", + "tokio", + "tokio-postgres", + "url", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-ccsr" +version = "0.0.0" +dependencies = [ + "anyhow", + "hyper", + "mz-ore", + "native-tls", + "once_cell", + "openssl", + "prost-build", + "protobuf-src", + "reqwest", + "serde", + "serde_json", + "tokio", + "tracing", + "url", + "workspace-hack", +] + +[[package]] +name = "mz-cloud-api" +version = "0.0.0" +dependencies = [ + "anyhow", + "chrono", + "mz-frontegg-auth", + "mz-frontegg-client", + "once_cell", + "reqwest", + "serde", + "thiserror", + "tokio", + "url", + "workspace-hack", +] + +[[package]] +name = "mz-cloud-resources" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "chrono", + "futures", + "k8s-openapi", + "kube", + "mz-ore", + "mz-repr", + "schemars", + "serde", + "serde_json", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-cluster" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "bytesize", + "clap", + "crossbeam-channel", + "dec", + "differential-dataflow", + "futures", + "mz-build-info", + "mz-cluster-client", + "mz-ore", + "mz-persist-client", + "mz-persist-types", + "mz-pid-file", + "mz-repr", + "mz-service", + "mz-timely-util", + "once_cell", + "prometheus", + "regex", + "rocksdb", + "scopeguard", + "serde", + "smallvec", + "timely", + "tokio", + "tracing", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-cluster-client" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "chrono", + "futures", + "http", + "itertools", + "mz-ore", + "mz-proto", + "once_cell", + "prometheus", + "proptest", + "proptest-derive", + "prost", + "prost-build", + "protobuf-src", + "regex", + "serde", + "serde_json", + "thiserror", + "tokio", + "tokio-stream", + "tonic", + "tonic-build", + "tracing", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-clusterd" +version = "0.84.2" +dependencies = [ + "anyhow", + "axum", + "clap", + "fail", + "futures", + "mz-alloc", + "mz-build-info", + "mz-cloud-resources", + "mz-cluster", + "mz-compute", + "mz-compute-client", + "mz-http-util", + "mz-metrics", + "mz-orchestrator-tracing", + "mz-ore", + "mz-persist-client", + "mz-pid-file", + "mz-prof-http", + "mz-service", + "mz-storage", + "mz-storage-client", + "mz-storage-types", + "mz-timely-util", + "once_cell", + "timely", + "tokio", + "tracing", + "workspace-hack", +] + +[[package]] +name = "mz-compute" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "bytesize", + "clap", + "core_affinity", + "crossbeam-channel", + "dec", + "differential-dataflow", + "dogsdogsdogs", + "futures", + "itertools", + "lgalloc", + "mz-build-info", + "mz-cluster", + "mz-cluster-client", + "mz-compute-client", + "mz-compute-types", + "mz-expr", + "mz-ore", + "mz-persist-client", + "mz-persist-txn", + "mz-persist-types", + "mz-pid-file", + "mz-prof", + "mz-repr", + "mz-service", + "mz-storage-operators", + "mz-storage-types", + "mz-timely-util", + "once_cell", + "prometheus", + "scopeguard", + "serde", + "smallvec", + "timely", + "tokio", + "tracing", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-compute-client" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-stream", + "async-trait", + "bytesize", + "chrono", + "crossbeam-channel", + "differential-dataflow", + "futures", + "http", + "mz-build-info", + "mz-cluster-client", + "mz-compute-types", + "mz-expr", + "mz-orchestrator", + "mz-ore", + "mz-persist", + "mz-persist-client", + "mz-persist-types", + "mz-proto", + "mz-repr", + "mz-service", + "mz-storage-client", + "mz-storage-types", + "mz-timely-util", + "mz-tracing", + "once_cell", + "prometheus", + "proptest", + "proptest-derive", + "prost", + "prost-build", + "protobuf-src", + "regex", + "serde", + "serde_json", + "thiserror", + "timely", + "tokio", + "tokio-stream", + "tonic", + "tonic-build", + "tracing", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-compute-types" +version = "0.0.0" +dependencies = [ + "columnation", + "differential-dataflow", + "itertools", + "mz-expr", + "mz-ore", + "mz-proto", + "mz-repr", + "mz-storage-types", + "proptest", + "proptest-derive", + "prost", + "prost-build", + "protobuf-src", + "serde", + "timely", + "tonic-build", + "tracing", + "workspace-hack", +] + +[[package]] +name = "mz-controller" +version = "0.0.0" +dependencies = [ + "anyhow", + "bytesize", + "chrono", + "differential-dataflow", + "futures", + "mz-build-info", + "mz-cluster-client", + "mz-compute-client", + "mz-compute-types", + "mz-controller-types", + "mz-orchestrator", + "mz-ore", + "mz-persist-client", + "mz-persist-types", + "mz-proto", + "mz-repr", + "mz-service", + "mz-stash-types", + "mz-storage-client", + "mz-storage-controller", + "mz-storage-types", + "once_cell", + "regex", + "serde", + "serde_json", + "timely", + "tokio", + "tokio-stream", + "tracing", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-controller-types" +version = "0.0.0" +dependencies = [ + "mz-cluster-client", + "mz-compute-types", + "workspace-hack", +] + +[[package]] +name = "mz-environmentd" +version = "0.84.2" +dependencies = [ + "anyhow", + "askama", + "assert_cmd", + "async-trait", + "axum", + "base64 0.13.1", + "bytes", + "bytesize", + "cc", + "chrono", + "clap", + "datadriven", + "fail", + "fallible-iterator", + "futures", + "headers", + "http", + "http-body", + "humantime", + "hyper", + "hyper-openssl", + "hyper-tls", + "include_dir", + "itertools", + "jsonwebtoken", + "libc", + "mime", + "mz-adapter", + "mz-adapter-types", + "mz-alloc", + "mz-aws-secrets-controller", + "mz-build-info", + "mz-catalog", + "mz-cloud-resources", + "mz-controller", + "mz-environmentd", + "mz-expr", + "mz-frontegg-auth", + "mz-frontegg-mock", + "mz-http-util", + "mz-interchange", + "mz-metrics", + "mz-npm", + "mz-orchestrator", + "mz-orchestrator-kubernetes", + "mz-orchestrator-process", + "mz-orchestrator-tracing", + "mz-ore", + "mz-persist-client", + "mz-pgrepr", + "mz-pgtest", + "mz-pgwire", + "mz-pgwire-common", + "mz-prof-http", + "mz-repr", + "mz-secrets", + "mz-segment", + "mz-server-core", + "mz-service", + "mz-sql", + "mz-sql-parser", + "mz-stash", + "mz-stash-types", + "mz-storage-client", + "mz-storage-types", + "mz-tls-util", + "mz-tracing", + "nix", + "num_cpus", + "once_cell", + "openssl", + "openssl-sys", + "opentelemetry", + "opentelemetry_sdk", + "pin-project", + "postgres", + "postgres-openssl", + "postgres-protocol", + "postgres_array", + "predicates", + "prometheus", + "proptest", + "rand", + "rdkafka-sys", + "regex", + "reqwest", + "rlimit", + "sentry", + "sentry-tracing", + "serde", + "serde_json", + "serde_urlencoded", + "shell-words", + "similar-asserts", + "sysctl", + "tempfile", + "thiserror", + "timely", + "tokio", + "tokio-openssl", + "tokio-postgres", + "tokio-stream", + "tower", + "tower-http", + "tracing", + "tracing-core", + "tracing-opentelemetry", + "tracing-subscriber", + "tungstenite", + "url", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-expr" +version = "0.0.0" +dependencies = [ + "aho-corasick", + "anyhow", + "bytes", + "bytesize", + "chrono", + "chrono-tz", + "criterion", + "csv", + "datadriven", + "dec", + "derivative", + "encoding", + "enum-iterator", + "fallible-iterator", + "hex", + "hmac", + "itertools", + "md-5", + "mz-expr-test-util", + "mz-lowertest", + "mz-ore", + "mz-persist-types", + "mz-pgrepr", + "mz-pgtz", + "mz-proto", + "mz-regexp", + "mz-repr", + "mz-sql-parser", + "mz-sql-pretty", + "num", + "num_enum", + "once_cell", + "ordered-float", + "paste", + "proc-macro2", + "proptest", + "proptest-derive", + "prost", + "prost-build", + "protobuf-src", + "regex", + "regex-syntax", + "serde", + "serde_json", + "serde_regex", + "sha1", + "sha2", + "subtle", + "timely", + "tracing", + "uncased", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-expr-parser" +version = "0.0.0" +dependencies = [ + "datadriven", + "mz-expr", + "mz-ore", + "mz-repr", + "proc-macro2", + "syn 2.0.39", + "workspace-hack", +] + +[[package]] +name = "mz-expr-test-util" +version = "0.0.0" +dependencies = [ + "datadriven", + "mz-expr", + "mz-lowertest", + "mz-ore", + "mz-repr", + "mz-repr-test-util", + "proc-macro2", + "serde", + "serde_json", + "workspace-hack", +] + +[[package]] +name = "mz-fivetran-destination" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-compression", + "clap", + "csv-async", + "futures", + "itertools", + "mz-ore", + "mz-pgrepr", + "openssl", + "postgres-openssl", + "postgres-protocol", + "prost", + "prost-build", + "prost-types", + "protobuf-src", + "tokio", + "tokio-postgres", + "tonic", + "tonic-build", + "workspace-hack", +] + +[[package]] +name = "mz-frontegg-auth" +version = "0.0.0" +dependencies = [ + "anyhow", + "axum", + "base64 0.13.1", + "clap", + "derivative", + "futures", + "jsonwebtoken", + "mz-ore", + "mz-repr", + "prometheus", + "reqwest", + "reqwest-middleware", + "reqwest-retry", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-frontegg-client" +version = "0.0.0" +dependencies = [ + "jsonwebtoken", + "mz-frontegg-auth", + "mz-ore", + "once_cell", + "reqwest", + "serde", + "serde_json", + "thiserror", + "tokio", + "url", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-frontegg-mock" +version = "0.0.0" +dependencies = [ + "anyhow", + "clap", + "hyper", + "jsonwebtoken", + "mz-frontegg-auth", + "mz-ore", + "serde", + "serde_json", + "tokio", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-http-util" +version = "0.0.0" +dependencies = [ + "anyhow", + "askama", + "axum", + "headers", "http", "hyper", - "hyper-proxy", - "hyper-tls", - "ipnet", - "lazy_static", - "reqwest", - "tracing", -] - -[[package]] -name = "mz-process-collector" -version = "0.0.0" -dependencies = [ - "lazy_static", - "libc", - "ore", - "procfs", + "include_dir", + "mz-ore", "prometheus", + "serde", + "serde_json", + "tokio", + "tower", + "tower-http", + "tracing", + "tracing-subscriber", + "workspace-hack", ] [[package]] -name = "mz-protoc" +name = "mz-interchange" version = "0.0.0" dependencies = [ "anyhow", + "byteorder", + "chrono", "clap", - "ore", - "protobuf", - "protobuf-codegen", - "protobuf-parse", - "tempfile", + "criterion", + "differential-dataflow", + "itertools", + "maplit", + "mz-avro", + "mz-avro-derive", + "mz-ccsr", + "mz-ore", + "mz-repr", + "once_cell", + "ordered-float", + "prost", + "prost-build", + "prost-reflect", + "protobuf-src", + "serde_json", + "timely", + "tokio", + "tracing", + "uuid", + "workspace-hack", ] [[package]] -name = "mzcloud" -version = "1.0.0" -source = "git+https://github.com/MaterializeInc/cloud-sdks#b7886468ceb9e76d1c4b9e0b1b82a957ddd2b1c8" +name = "mz-kafka-util" +version = "0.0.0" +dependencies = [ + "anyhow", + "chrono", + "clap", + "crossbeam", + "fancy-regex", + "futures", + "mz-avro", + "mz-ccsr", + "mz-ore", + "mz-ssh-util", + "num_cpus", + "prost", + "prost-build", + "protobuf-src", + "rand", + "rdkafka", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", + "url", + "workspace-hack", +] + +[[package]] +name = "mz-lowertest" +version = "0.0.0" +dependencies = [ + "anyhow", + "datadriven", + "mz-lowertest-derive", + "mz-ore", + "proc-macro2", + "serde", + "serde_json", + "workspace-hack", +] + +[[package]] +name = "mz-lowertest-derive" +version = "0.0.0" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", + "workspace-hack", +] + +[[package]] +name = "mz-lsp-server" +version = "0.3.0" +dependencies = [ + "httparse", + "mz-build-info", + "mz-ore", + "mz-sql-lexer", + "mz-sql-parser", + "mz-sql-pretty", + "once_cell", + "regex", + "ropey", + "serde", + "serde_json", + "tokio", + "tower-lsp", + "workspace-hack", +] + +[[package]] +name = "mz-metabase" +version = "0.0.0" dependencies = [ "reqwest", "serde", - "serde_derive", - "serde_json", - "url", + "workspace-hack", ] [[package]] -name = "mzcloud-cli" +name = "mz-metabase-smoketest" +version = "0.0.0" +dependencies = [ + "anyhow", + "itertools", + "mz-metabase", + "mz-ore", + "tokio", + "tokio-postgres", + "tracing", + "workspace-hack", +] + +[[package]] +name = "mz-metrics" +version = "0.0.0" +dependencies = [ + "lgalloc", + "libc", + "mz-ore", + "paste", + "prometheus", + "tokio", + "workspace-hack", +] + +[[package]] +name = "mz-mysql-util" version = "0.1.0" dependencies = [ "anyhow", - "clap", - "mzcloud", - "ore", + "indexmap 1.9.1", + "itertools", + "mysql_async", + "mz-ore", + "mz-proto", + "mz-repr", + "mz-ssh-util", + "once_cell", + "proptest", + "prost", + "prost-build", + "protobuf-src", + "serde", + "thiserror", + "tonic-build", + "tracing", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-npm" +version = "0.0.0" +dependencies = [ + "anyhow", + "flate2", + "hex", + "hex-literal", "reqwest", + "sha2", + "tar", + "walkdir", + "workspace-hack", +] + +[[package]] +name = "mz-orchestrator" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "bytesize", + "chrono", + "derivative", + "futures-core", + "mz-ore", + "prost", + "protobuf-src", + "serde", + "tonic-build", + "workspace-hack", +] + +[[package]] +name = "mz-orchestrator-kubernetes" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "chrono", + "clap", + "fail", + "futures", + "k8s-openapi", + "kube", + "maplit", + "mz-cloud-resources", + "mz-orchestrator", + "mz-repr", + "mz-secrets", + "serde", + "serde_json", + "sha2", + "tracing", + "workspace-hack", +] + +[[package]] +name = "mz-orchestrator-process" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-stream", + "async-trait", + "chrono", + "futures", + "hex", + "itertools", + "libc", + "maplit", + "mz-orchestrator", + "mz-ore", + "mz-pid-file", + "mz-repr", + "mz-secrets", + "nix", + "scopeguard", + "serde", + "serde_json", + "sha1", + "sysinfo", + "tokio", + "tracing", + "workspace-hack", +] + +[[package]] +name = "mz-orchestrator-tracing" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "clap", + "futures-core", + "http", + "humantime", + "mz-build-info", + "mz-orchestrator", + "mz-ore", + "mz-repr", + "mz-service", + "mz-tracing", + "opentelemetry", + "opentelemetry_sdk", + "sentry-tracing", + "tracing", + "tracing-subscriber", + "workspace-hack", +] + +[[package]] +name = "mz-ore" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "atty", + "bytes", + "chrono", + "clap", + "compact_bytes", + "console-subscriber", + "criterion", + "ctor", + "either", + "futures", + "hibitset", + "http", + "hyper", + "hyper-tls", + "lgalloc", + "mz-ore", + "mz-test-macro", + "native-tls", + "num", + "once_cell", + "openssl", + "opentelemetry", + "opentelemetry-otlp", + "opentelemetry_sdk", + "paste", + "pin-project", + "prometheus", + "proptest", + "rand", + "scopeguard", + "sentry", + "sentry-tracing", + "serde", + "serde_json", + "smallvec", + "stacker", + "tokio", + "tokio-native-tls", + "tokio-openssl", + "tokio-test", + "tonic", + "tracing", + "tracing-opentelemetry", + "tracing-subscriber", + "uuid", + "workspace-hack", + "yansi", +] + +[[package]] +name = "mz-persist" +version = "0.0.0" +dependencies = [ + "anyhow", + "arrow2", + "async-stream", + "async-trait", + "aws-config", + "aws-credential-types", + "aws-sdk-s3", + "aws-types", + "base64 0.13.1", + "bytes", + "deadpool-postgres", + "differential-dataflow", + "fail", + "futures-util", + "md-5", + "mz-aws-util", + "mz-ore", + "mz-persist-types", + "mz-postgres-client", + "mz-proto", + "once_cell", + "openssl", + "openssl-sys", + "postgres-openssl", + "prometheus", + "proptest", + "proptest-derive", + "prost", + "prost-build", + "protobuf-src", + "rand", "serde", "serde_json", "tempfile", + "timely", "tokio", - "zip", + "tokio-postgres", + "tracing", + "url", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-persist-client" +version = "0.84.2" +dependencies = [ + "anyhow", + "async-stream", + "async-trait", + "bytes", + "clap", + "criterion", + "datadriven", + "differential-dataflow", + "futures", + "futures-task", + "futures-util", + "h2", + "hex", + "mz-build-info", + "mz-ore", + "mz-persist", + "mz-persist-types", + "mz-postgres-client", + "mz-proto", + "mz-timely-util", + "num_cpus", + "once_cell", + "prometheus", + "proptest", + "proptest-derive", + "prost", + "prost-build", + "protobuf-src", + "semver", + "sentry-tracing", + "serde", + "serde_json", + "tempfile", + "thiserror", + "timely", + "tokio", + "tokio-metrics", + "tokio-stream", + "tonic", + "tonic-build", + "tracing", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-persist-txn" +version = "0.0.0" +dependencies = [ + "bytes", + "crossbeam-channel", + "differential-dataflow", + "futures", + "itertools", + "mz-ore", + "mz-persist-client", + "mz-persist-types", + "mz-timely-util", + "prometheus", + "prost", + "prost-build", + "protobuf-src", + "rand", + "serde", + "timely", + "tokio", + "tracing", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-persist-types" +version = "0.0.0" +dependencies = [ + "anyhow", + "arrow2", + "bytes", + "chrono", + "hex", + "mz-ore", + "mz-proto", + "parquet2", + "proptest", + "proptest-derive", + "prost", + "prost-build", + "protobuf-src", + "serde", + "serde_json", + "workspace-hack", +] + +[[package]] +name = "mz-pgcopy" +version = "0.0.0" +dependencies = [ + "bytes", + "csv", + "mz-ore", + "mz-pgrepr", + "mz-repr", + "workspace-hack", +] + +[[package]] +name = "mz-pgrepr" +version = "0.0.0" +dependencies = [ + "byteorder", + "bytes", + "chrono", + "dec", + "mz-ore", + "mz-pgrepr-consts", + "mz-pgwire-common", + "mz-repr", + "once_cell", + "postgres-types", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-pgrepr-consts" +version = "0.0.0" +dependencies = [ + "workspace-hack", +] + +[[package]] +name = "mz-pgtest" +version = "0.0.0" +dependencies = [ + "anyhow", + "bytes", + "clap", + "datadriven", + "fallible-iterator", + "mz-ore", + "postgres-protocol", + "serde", + "serde_json", + "workspace-hack", +] + +[[package]] +name = "mz-pgtz" +version = "0.0.0" +dependencies = [ + "anyhow", + "chrono", + "chrono-tz", + "mz-lowertest", + "mz-ore", + "mz-proto", + "phf", + "phf_codegen", + "proptest", + "proptest-derive", + "prost", + "prost-build", + "protobuf-src", + "serde", + "uncased", + "workspace-hack", +] + +[[package]] +name = "mz-pgwire" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "byteorder", + "bytes", + "bytesize", + "futures", + "itertools", + "mz-adapter", + "mz-adapter-types", + "mz-expr", + "mz-frontegg-auth", + "mz-ore", + "mz-pgcopy", + "mz-pgrepr", + "mz-pgwire-common", + "mz-repr", + "mz-server-core", + "mz-sql", + "openssl", + "postgres", + "tokio", + "tokio-openssl", + "tokio-stream", + "tokio-util", + "tracing", + "workspace-hack", +] + +[[package]] +name = "mz-pgwire-common" +version = "0.0.0" +dependencies = [ + "async-trait", + "byteorder", + "bytes", + "bytesize", + "mz-ore", + "mz-server-core", + "tokio", + "tokio-openssl", + "tokio-postgres", + "tracing", + "workspace-hack", +] + +[[package]] +name = "mz-pid-file" +version = "0.0.0" +dependencies = [ + "cc", + "libc", + "mz-ore", + "tempfile", + "workspace-hack", +] + +[[package]] +name = "mz-postgres-client" +version = "0.0.0" +dependencies = [ + "anyhow", + "deadpool-postgres", + "mz-ore", + "mz-tls-util", + "prometheus", + "tokio", + "tracing", + "workspace-hack", +] + +[[package]] +name = "mz-postgres-util" +version = "0.0.0" +dependencies = [ + "anyhow", + "mz-cloud-resources", + "mz-ore", + "mz-proto", + "mz-repr", + "mz-ssh-util", + "mz-tls-util", + "openssh", + "openssl", + "postgres-openssl", + "postgres_array", + "proptest", + "prost", + "prost-build", + "protobuf-src", + "serde", + "thiserror", + "tokio", + "tokio-postgres", + "tonic-build", + "tracing", + "workspace-hack", +] + +[[package]] +name = "mz-proc" +version = "0.1.0" +dependencies = [ + "anyhow", + "libc", + "mz-ore", + "workspace-hack", +] + +[[package]] +name = "mz-prof" +version = "0.0.0" +dependencies = [ + "anyhow", + "backtrace", + "flate2", + "libc", + "mz-ore", + "mz-proc", + "once_cell", + "pprof", + "prost", + "prost-build", + "protobuf-src", + "tempfile", + "tikv-jemalloc-ctl", + "tokio", + "tracing", + "workspace-hack", +] + +[[package]] +name = "mz-prof-http" +version = "0.0.0" +dependencies = [ + "anyhow", + "askama", + "axum", + "bytesize", + "cfg-if", + "headers", + "http", + "include_dir", + "mime", + "mz-build-info", + "mz-http-util", + "mz-npm", + "mz-ore", + "mz-prof", + "once_cell", + "serde", + "tokio", + "tracing", + "workspace-hack", +] + +[[package]] +name = "mz-proto" +version = "0.0.0" +dependencies = [ + "anyhow", + "chrono", + "chrono-tz", + "globset", + "http", + "mz-ore", + "num", + "proptest", + "prost", + "prost-build", + "protobuf-src", + "regex", + "serde_json", + "tokio-postgres", + "url", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-regexp" +version = "0.0.0" +dependencies = [ + "anyhow", + "mz-ore", + "mz-repr", + "postgres", + "regex", + "workspace-hack", +] + +[[package]] +name = "mz-repr" +version = "0.0.0" +dependencies = [ + "anyhow", + "bitflags 1.3.2", + "bytes", + "cfg-if", + "chrono", + "chrono-tz", + "columnation", + "compact_bytes", + "criterion", + "dec", + "differential-dataflow", + "enum-kinds", + "enum_dispatch", + "fast-float", + "hex", + "itertools", + "mz-lowertest", + "mz-ore", + "mz-persist", + "mz-persist-types", + "mz-pgtz", + "mz-proto", + "mz-sql-parser", + "num-traits", + "num_enum", + "once_cell", + "ordered-float", + "postgres-protocol", + "proptest", + "proptest-derive", + "prost", + "prost-build", + "protobuf-src", + "rand", + "regex", + "ryu", + "serde", + "serde_json", + "smallvec", + "static_assertions", + "strsim", + "thiserror", + "timely", + "tokio-postgres", + "tracing", + "tracing-core", + "tracing-subscriber", + "url", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-repr-test-util" +version = "0.0.0" +dependencies = [ + "chrono", + "datadriven", + "mz-lowertest", + "mz-ore", + "mz-repr", + "proc-macro2", + "workspace-hack", +] + +[[package]] +name = "mz-rocksdb" +version = "0.0.0" +dependencies = [ + "anyhow", + "bincode", + "derivative", + "itertools", + "mz-ore", + "mz-proto", + "mz-rocksdb-types", + "num_cpus", + "once_cell", + "prometheus", + "proptest", + "proptest-derive", + "prost", + "prost-build", + "protobuf-src", + "rocksdb", + "serde", + "serde_json", + "tempfile", + "thiserror", + "tokio", + "tonic-build", + "tracing", + "uncased", + "workspace-hack", +] + +[[package]] +name = "mz-rocksdb-types" +version = "0.0.0" +dependencies = [ + "anyhow", + "mz-ore", + "mz-proto", + "num_cpus", + "proptest", + "proptest-derive", + "prost", + "prost-build", + "protobuf-src", + "serde", + "tonic-build", + "uncased", + "workspace-hack", +] + +[[package]] +name = "mz-s3-datagen" +version = "0.0.0" +dependencies = [ + "anyhow", + "aws-config", + "aws-sdk-s3", + "bytefmt", + "clap", + "futures", + "indicatif", + "mz-aws-util", + "mz-ore", + "tokio", + "tracing", + "tracing-subscriber", + "workspace-hack", +] + +[[package]] +name = "mz-secrets" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "mz-ore", + "mz-repr", + "tokio", + "tracing", + "workspace-hack", +] + +[[package]] +name = "mz-segment" +version = "0.0.0" +dependencies = [ + "mz-ore", + "segment", + "serde_json", + "tokio", + "tracing", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-server-core" +version = "0.0.0" +dependencies = [ + "anyhow", + "clap", + "futures", + "mz-ore", + "openssl", + "socket2 0.5.3", + "tokio", + "tokio-stream", + "tracing", + "workspace-hack", +] + +[[package]] +name = "mz-service" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-stream", + "async-trait", + "clap", + "crossbeam-channel", + "futures", + "http", + "itertools", + "mz-aws-secrets-controller", + "mz-build-info", + "mz-orchestrator-kubernetes", + "mz-orchestrator-process", + "mz-ore", + "mz-proto", + "mz-repr", + "mz-secrets", + "once_cell", + "os_info", + "proptest", + "proptest-derive", + "prost", + "prost-build", + "protobuf-src", + "semver", + "sentry-tracing", + "serde", + "sysinfo", + "timely", + "tokio", + "tokio-stream", + "tonic", + "tonic-build", + "tower", + "tracing", + "workspace-hack", +] + +[[package]] +name = "mz-sql" +version = "0.0.0" +dependencies = [ + "anyhow", + "array-concat", + "aws-sdk-sts", + "bitflags 1.3.2", + "chrono", + "clap", + "datadriven", + "enum-kinds", + "fail", + "globset", + "hex", + "http", + "itertools", + "maplit", + "mysql_async", + "mz-adapter-types", + "mz-build-info", + "mz-ccsr", + "mz-cloud-resources", + "mz-controller-types", + "mz-expr", + "mz-interchange", + "mz-kafka-util", + "mz-lowertest", + "mz-mysql-util", + "mz-orchestrator", + "mz-ore", + "mz-persist-client", + "mz-pgcopy", + "mz-pgrepr", + "mz-pgwire-common", + "mz-postgres-util", + "mz-proto", + "mz-repr", + "mz-rocksdb-types", + "mz-secrets", + "mz-sql-lexer", + "mz-sql-parser", + "mz-ssh-util", + "mz-storage-types", + "mz-tracing", + "num_enum", + "once_cell", + "paste", + "postgres_array", + "proptest", + "proptest-derive", + "prost", + "protobuf-native", + "rdkafka", + "regex", + "reqwest", + "serde", + "serde_json", + "static_assertions", + "thiserror", + "tokio", + "tokio-postgres", + "tracing", + "tracing-subscriber", + "uncased", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-sql-lexer" +version = "0.0.0" +dependencies = [ + "anyhow", + "datadriven", + "mz-ore", + "phf", + "phf_codegen", + "serde", + "uncased", + "workspace-hack", +] + +[[package]] +name = "mz-sql-parser" +version = "0.0.0" +dependencies = [ + "anyhow", + "bytesize", + "datadriven", + "enum-kinds", + "itertools", + "mz-ore", + "mz-sql-lexer", + "mz-sql-parser", + "mz-walkabout", + "phf", + "serde", + "thiserror", + "tracing", + "uncased", + "unicode-width", + "workspace-hack", +] + +[[package]] +name = "mz-sql-pretty" +version = "0.0.0" +dependencies = [ + "datadriven", + "mz-ore", + "mz-sql-parser", + "pretty", + "thiserror", + "workspace-hack", +] + +[[package]] +name = "mz-sqllogictest" +version = "0.0.1" +dependencies = [ + "anyhow", + "bytes", + "chrono", + "clap", + "dec", + "fallible-iterator", + "futures", + "itertools", + "junit-report", + "md-5", + "mz-build-info", + "mz-cloud-resources", + "mz-controller", + "mz-environmentd", + "mz-orchestrator", + "mz-orchestrator-process", + "mz-orchestrator-tracing", + "mz-ore", + "mz-persist-client", + "mz-pgrepr", + "mz-repr", + "mz-secrets", + "mz-service", + "mz-sql", + "mz-sql-parser", + "mz-stash-types", + "mz-storage-types", + "mz-tracing", + "once_cell", + "postgres-protocol", + "regex", + "reqwest", + "serde_json", + "shell-words", + "tempfile", + "time", + "tokio", + "tokio-postgres", + "tokio-stream", + "tower-http", + "tracing", + "uuid", + "walkdir", + "workspace-hack", +] + +[[package]] +name = "mz-ssh-util" +version = "0.0.0" +dependencies = [ + "anyhow", + "futures", + "mz-ore", + "openssh", + "openssh-mux-client", + "openssl", + "rand", + "scopeguard", + "serde", + "serde_json", + "ssh-key", + "tempfile", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "workspace-hack", + "zeroize", +] + +[[package]] +name = "mz-stash" +version = "0.0.0" +dependencies = [ + "bytes", + "criterion", + "derivative", + "differential-dataflow", + "fail", + "futures", + "itertools", + "mz-ore", + "mz-proto", + "mz-stash-types", + "mz-tls-util", + "once_cell", + "paste", + "postgres-openssl", + "prometheus", + "proptest", + "prost", + "rand", + "serde", + "timely", + "tokio", + "tokio-postgres", + "tracing", + "workspace-hack", +] + +[[package]] +name = "mz-stash-debug" +version = "0.84.2" +dependencies = [ + "anyhow", + "clap", + "futures", + "mz-adapter", + "mz-build-info", + "mz-catalog", + "mz-ore", + "mz-secrets", + "mz-sql", + "mz-stash", + "mz-storage-controller", + "mz-storage-types", + "mz-tls-util", + "once_cell", + "prost", + "serde_json", + "tokio", + "tokio-postgres", + "tracing", + "tracing-subscriber", + "workspace-hack", +] + +[[package]] +name = "mz-stash-types" +version = "0.0.0" +dependencies = [ + "anyhow", + "mz-ore", + "mz-proto", + "paste", + "prometheus", + "prost", + "serde", + "tokio-postgres", + "workspace-hack", +] + +[[package]] +name = "mz-storage" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-stream", + "async-trait", + "axum", + "bincode", + "bytes", + "bytesize", + "chrono", + "clap", + "crossbeam-channel", + "csv-core", + "datadriven", + "dec", + "differential-dataflow", + "either", + "fail", + "futures", + "globset", + "http", + "humantime", + "indexmap 2.0.0", + "itertools", + "maplit", + "mysql_async", + "mysql_common", + "mz-avro", + "mz-aws-util", + "mz-build-info", + "mz-ccsr", + "mz-cloud-resources", + "mz-cluster", + "mz-expr", + "mz-http-util", + "mz-interchange", + "mz-kafka-util", + "mz-mysql-util", + "mz-orchestrator-tracing", + "mz-ore", + "mz-persist", + "mz-persist-client", + "mz-persist-types", + "mz-pgcopy", + "mz-pid-file", + "mz-postgres-util", + "mz-repr", + "mz-rocksdb", + "mz-secrets", + "mz-service", + "mz-sql-parser", + "mz-ssh-util", + "mz-storage-client", + "mz-storage-operators", + "mz-storage-types", + "mz-timely-util", + "num_cpus", + "once_cell", + "postgres-protocol", + "prometheus", + "prost", + "protobuf-src", + "rand", + "rdkafka", + "regex", + "rocksdb", + "seahash", + "serde", + "serde_json", + "sha2", + "tempfile", + "thiserror", + "timely", + "tokio", + "tokio-postgres", + "tokio-stream", + "tokio-util", + "tonic-build", + "tracing", + "tracing-subscriber", + "url", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-storage-client" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "chrono", + "differential-dataflow", + "http", + "itertools", + "maplit", + "mz-ccsr", + "mz-cluster-client", + "mz-kafka-util", + "mz-ore", + "mz-persist-client", + "mz-persist-types", + "mz-proto", + "mz-repr", + "mz-service", + "mz-storage-types", + "mz-timely-util", + "once_cell", + "prometheus", + "proptest", + "prost", + "prost-build", + "protobuf-src", + "rdkafka", + "serde", + "serde_json", + "static_assertions", + "timely", + "tokio", + "tokio-stream", + "tonic", + "tonic-build", + "tracing", + "workspace-hack", +] + +[[package]] +name = "mz-storage-controller" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "bytes", + "chrono", + "differential-dataflow", + "futures", + "itertools", + "mz-build-info", + "mz-cluster-client", + "mz-ore", + "mz-persist-client", + "mz-persist-txn", + "mz-persist-types", + "mz-proto", + "mz-repr", + "mz-service", + "mz-stash", + "mz-stash-types", + "mz-storage-client", + "mz-storage-types", + "mz-tls-util", + "once_cell", + "proptest", + "prost", + "serde", + "serde_json", + "timely", + "tokio", + "tokio-postgres", + "tokio-stream", + "tracing", + "workspace-hack", +] + +[[package]] +name = "mz-storage-operators" +version = "0.0.0" +dependencies = [ + "async-stream", + "differential-dataflow", + "futures", + "mz-expr", + "mz-ore", + "mz-persist-client", + "mz-persist-txn", + "mz-persist-types", + "mz-repr", + "mz-storage-types", + "mz-timely-util", + "prometheus", + "proptest", + "serde", + "timely", + "tokio", + "tracing", + "workspace-hack", +] + +[[package]] +name = "mz-storage-types" +version = "0.0.0" +dependencies = [ + "anyhow", + "aws-config", + "aws-credential-types", + "aws-sdk-sts", + "aws-types", + "base64 0.13.1", + "bytes", + "dec", + "derivative", + "differential-dataflow", + "fail", + "itertools", + "mysql_async", + "mz-aws-util", + "mz-ccsr", + "mz-cloud-resources", + "mz-expr", + "mz-interchange", + "mz-kafka-util", + "mz-mysql-util", + "mz-ore", + "mz-persist-client", + "mz-persist-txn", + "mz-persist-types", + "mz-postgres-util", + "mz-proto", + "mz-repr", + "mz-rocksdb-types", + "mz-secrets", + "mz-service", + "mz-ssh-util", + "mz-stash-types", + "mz-timely-util", + "mz-tracing", + "native-tls", + "num_enum", + "once_cell", + "openssl", + "proptest", + "proptest-derive", + "prost", + "prost-build", + "protobuf-src", + "rdkafka", + "scopeguard", + "serde", + "serde_json", + "thiserror", + "timely", + "tokio", + "tokio-postgres", + "tonic-build", + "tracing", + "url", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-test-macro" +version = "0.1.0" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", + "workspace-hack", +] + +[[package]] +name = "mz-test-util" +version = "0.0.0" +dependencies = [ + "anyhow", + "chrono", + "mz-kafka-util", + "mz-ore", + "rand", + "rdkafka", + "tokio", + "tokio-postgres", + "tracing", + "workspace-hack", +] + +[[package]] +name = "mz-testdrive" +version = "0.84.2" +dependencies = [ + "anyhow", + "async-compression", + "async-trait", + "atty", + "aws-config", + "aws-credential-types", + "aws-sdk-sts", + "aws-types", + "byteorder", + "bytes", + "chrono", + "clap", + "flate2", + "futures", + "globset", + "hex", + "http", + "humantime", + "itertools", + "junit-report", + "maplit", + "md-5", + "mysql_async", + "mz-adapter", + "mz-avro", + "mz-aws-util", + "mz-build-info", + "mz-catalog", + "mz-ccsr", + "mz-expr", + "mz-interchange", + "mz-kafka-util", + "mz-ore", + "mz-persist-client", + "mz-persist-types", + "mz-pgrepr", + "mz-repr", + "mz-sql", + "mz-sql-parser", + "mz-stash", + "mz-storage-types", + "mz-tls-util", + "once_cell", + "postgres_array", + "prost", + "prost-reflect", + "protobuf-src", + "rand", + "rdkafka", + "regex", + "reqwest", + "serde", + "serde_json", + "similar", + "tempfile", + "termcolor", + "tiberius", + "time", + "tokio", + "tokio-postgres", + "tokio-stream", + "tokio-util", + "tracing", + "tracing-subscriber", + "url", + "uuid", + "walkdir", + "workspace-hack", +] + +[[package]] +name = "mz-timely-util" +version = "0.0.0" +dependencies = [ + "ahash", + "differential-dataflow", + "futures-util", + "mz-ore", + "num-traits", + "proptest", + "serde", + "timely", + "tokio", + "workspace-hack", +] + +[[package]] +name = "mz-timestamp-oracle" +version = "0.0.0" +dependencies = [ + "anyhow", + "async-trait", + "deadpool-postgres", + "dec", + "futures", + "mz-adapter-types", + "mz-ore", + "mz-pgrepr", + "mz-postgres-client", + "mz-repr", + "rand", + "serde", + "tokio", + "tracing", + "uuid", + "workspace-hack", +] + +[[package]] +name = "mz-tls-util" +version = "0.0.0" +dependencies = [ + "anyhow", + "openssl", + "openssl-sys", + "postgres-openssl", + "thiserror", + "tokio", + "tokio-postgres", + "tracing", + "workspace-hack", +] + +[[package]] +name = "mz-tracing" +version = "0.0.0" +dependencies = [ + "anyhow", + "mz-ore", + "mz-proto", + "proptest", + "prost", + "prost-build", + "protobuf-src", + "serde", + "tonic-build", + "tracing", + "tracing-subscriber", + "workspace-hack", +] + +[[package]] +name = "mz-transform" +version = "0.0.0" +dependencies = [ + "anyhow", + "datadriven", + "differential-dataflow", + "enum-kinds", + "itertools", + "mz-compute-types", + "mz-expr", + "mz-expr-parser", + "mz-expr-test-util", + "mz-lowertest", + "mz-ore", + "mz-persist-client", + "mz-repr", + "num-traits", + "ordered-float", + "paste", + "proc-macro2", + "serde_json", + "tracing", + "workspace-hack", +] + +[[package]] +name = "mz-walkabout" +version = "0.0.0" +dependencies = [ + "anyhow", + "datadriven", + "itertools", + "mz-ore", + "quote", + "syn 1.0.107", + "tempfile", + "workspace-hack", ] [[package]] name = "native-tls" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ "lazy_static", "libc", @@ -2937,28 +6199,40 @@ dependencies = [ [[package]] name = "nix" -version = "0.23.1" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" +checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694" dependencies = [ - "bitflags", - "cc", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset", + "pin-utils", + "static_assertions", ] [[package]] -name = "nom" -version = "7.1.0" +name = "no-std-compat" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109" +checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" + +[[package]] +name = "nom" +version = "7.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5507769c4919c998e69e49c839d9dc6e693ede4cc4290d6ad8b41d4f09c548c" dependencies = [ "memchr", "minimal-lexical", - "version_check", ] +[[package]] +name = "nonzero_ext" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" + [[package]] name = "normalize-line-endings" version = "0.3.0" @@ -2967,13 +6241,23 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "ntapi" -version = "0.3.4" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a31937dea023539c72ddae0e3571deadc1414b300483fa7aaec176168cfa9d2" +checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc" dependencies = [ "winapi", ] +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "num" version = "0.4.0" @@ -2990,9 +6274,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74e768dff5fb39a41b3bcd30bb25cf989706c90d028d1ad71971987aa309d535" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" dependencies = [ "autocfg", "num-integer", @@ -3043,43 +6327,42 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", - "libm", ] [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi", + "hermit-abi 0.2.6", "libc", ] [[package]] name = "num_enum" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "720d3ea1055e4e4574c0c0b0f8c3fd4f24c4cdaf465948206dea090b57b526ad" +checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d992b768490d7fe0d8586d9b5745f6c49f557da6d81dc982b1d167ad4edbb21" +checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -3090,18 +6373,18 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.27.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" +checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.8.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" @@ -3110,19 +6393,73 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebcec7c9c2a95cacc7cd0ecb89d8a8454eca13906f6deb55258ffff0adeb9405" [[package]] -name = "openssl" -version = "0.10.38" +name = "open" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" +checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" dependencies = [ - "bitflags", + "pathdiff", + "windows-sys 0.42.0", +] + +[[package]] +name = "openssh" +version = "0.9.9" +source = "git+https://github.com/MaterializeInc/openssh.git#34404a274c5e1a7addd48940656fa12b7531e793" +dependencies = [ + "dirs", + "libc", + "once_cell", + "openssh-mux-client", + "shell-escape", + "tempfile", + "thiserror", + "tokio", + "tokio-pipe", +] + +[[package]] +name = "openssh-mux-client" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88eac793af6170bcd6d4f39c3b7ba3f4227cab5680d7189ba30f9d174600b75f" +dependencies = [ + "once_cell", + "sendfd", + "serde", + "ssh_format", + "thiserror", + "tokio", + "tokio-io-utility", + "typed-builder", +] + +[[package]] +name = "openssl" +version = "0.10.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +dependencies = [ + "bitflags 1.3.2", "cfg-if", "foreign-types", "libc", "once_cell", + "openssl-macros", "openssl-sys", ] +[[package]] +name = "openssl-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + [[package]] name = "openssl-probe" version = "0.1.2" @@ -3131,20 +6468,19 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" [[package]] name = "openssl-src" -version = "111.16.0+1.1.1l" +version = "111.25.0+1.1.1t" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab2173f69416cf3ec12debb5823d244127d23a9b127d5a5189aa97c5fa2859f" +checksum = "3173cd3626c43e3854b1b727422a276e568d9ec5fe8cec197822cf52cfb743d6" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.72" +version = "0.9.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" dependencies = [ - "autocfg", "cc", "libc", "openssl-src", @@ -3153,130 +6489,192 @@ dependencies = [ ] [[package]] -name = "opentls" -version = "0.2.1" +name = "opentelemetry" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f561874f8d6ecfb674fc08863414040c93cc90c0b6963fe679895fab8b65560" +checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a" dependencies = [ - "futures-util", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "url", + "futures-core", + "futures-sink", + "indexmap 2.0.0", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", + "urlencoding", ] +[[package]] +name = "opentelemetry-otlp" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f24cda83b20ed2433c68241f918d0f6fdec8b1d43b7a9590ab4420c5095ca930" +dependencies = [ + "async-trait", + "futures-core", + "http", + "opentelemetry", + "opentelemetry-proto", + "opentelemetry-semantic-conventions", + "opentelemetry_sdk", + "prost", + "thiserror", + "tokio", + "tonic", +] + +[[package]] +name = "opentelemetry-proto" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2e155ce5cc812ea3d1dffbd1539aed653de4bf4882d60e6e04dcf0901d674e1" +dependencies = [ + "opentelemetry", + "opentelemetry_sdk", + "prost", + "tonic", +] + +[[package]] +name = "opentelemetry-semantic-conventions" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" +dependencies = [ + "opentelemetry", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f16aec8a98a457a52664d69e0091bac3a0abd18ead9b641cb00202ba4e0efe4" +dependencies = [ + "async-trait", + "crossbeam-channel", + "futures-channel", + "futures-executor", + "futures-util", + "glob", + "once_cell", + "opentelemetry", + "ordered-float", + "percent-encoding", + "rand", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + [[package]] name = "ordered-float" -version = "2.10.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" +checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" dependencies = [ "num-traits", + "rand", "serde", ] -[[package]] -name = "ore" -version = "0.0.0" -dependencies = [ - "anyhow", - "async-trait", - "bytes", - "chrono", - "clap", - "crossbeam-utils", - "ctor", - "either", - "futures", - "lazy_static", - "openssl", - "pin-project", - "prometheus", - "smallvec", - "stacker", - "tokio", - "tokio-openssl", - "tracing-subscriber", -] - [[package]] name = "os_info" -version = "3.0.9" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b89dd55b8d8d97dabd0d1adc625d188378fcf87632825bfe9c956acc9a11a72a" +checksum = "c4750134fb6a5d49afc80777394ad5d95b04bc12068c6abb92fae8f43817270f" dependencies = [ "log", "serde", "winapi", ] -[[package]] -name = "os_pipe" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d06355a7090ce852965b2d08e11426c315438462638c6d721448d0b47aa22" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "os_str_bytes" version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" + +[[package]] +name = "output_vt100" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9" dependencies = [ - "memchr", + "winapi", +] + +[[package]] +name = "outref" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "papergrid" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1526bb6aa9f10ec339fb10360f22c57edf81d5678d0278e93bc12a47ffbe4b01" +dependencies = [ + "bytecount", + "fnv", + "unicode-width", ] [[package]] name = "parking_lot" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ - "instant", "lock_api", "parking_lot_core", ] [[package]] name = "parking_lot_core" -version = "0.8.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" dependencies = [ "cfg-if", - "instant", "libc", - "redox_syscall", + "redox_syscall 0.2.10", "smallvec", - "winapi", + "windows-sys 0.42.0", ] [[package]] -name = "parquet-format-async-temp" -version = "0.2.0" -source = "git+https://github.com/MaterializeInc/parquet-format-rs?branch=main#52ef597df1a4067f1d8b12766661ca9b32fd7310" +name = "parquet-format-safe" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1131c54b167dd4e4799ce762e1ab01549ebb94d5bdd13e6ec1b467491c378e1f" dependencies = [ "async-trait", - "byteorder", "futures", - "integer-encoding", - "ordered-float", ] [[package]] name = "parquet2" -version = "0.8.1" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57e98d7da0076cead49c49580cc5771dfe0ba8a93cadff9b47c1681a4a78e1f9" +checksum = "aefc53bedbf9bbe0ff8912befafaafe30ced83851fb0aebe86696a9289ebb29e" dependencies = [ "async-stream", - "bitpacking", "futures", - "parquet-format-async-temp", + "parquet-format-safe", + "seq-macro", "streaming-decompression", ] @@ -3291,158 +6689,102 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.6" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" +checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" [[package]] -name = "pdqselect" -version = "0.1.1" +name = "pathdiff" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7778906d9321dd56cde1d1ffa69a73e59dcf5fda6d366f62727adf2bd4193aee" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] -name = "percent-encoding" -version = "2.1.0" +name = "peeking_take_while" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] -name = "perf-kinesis" -version = "0.0.0" +name = "pem" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923" dependencies = [ - "anyhow", - "aws-sdk-kinesis", - "bytes", - "chrono", - "clap", - "env_logger", - "futures", - "futures-channel", - "mz-aws-util", - "ore", - "rand", - "test-util", - "tokio", - "tokio-postgres", - "tracing", + "base64 0.21.5", + "serde", ] [[package]] -name = "persist" +name = "pem-rfc7468" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "persistcli" version = "0.0.0" dependencies = [ - "arrow2", + "anyhow", "async-trait", - "aws-config", - "aws-sdk-s3", - "aws-types", - "base64", - "bincode", - "build-info", - "criterion", - "crossbeam-channel", + "axum", + "bytes", + "clap", "differential-dataflow", - "fail", - "futures-executor", - "futures-util", - "lazy_static", - "md-5", - "mz-aws-util", - "mz-protoc", - "ore", - "parquet2", - "persist-types", - "protobuf", - "rand", - "semver", + "futures", + "humantime", + "mz-http-util", + "mz-orchestrator-tracing", + "mz-ore", + "mz-persist", + "mz-persist-client", + "mz-persist-txn", + "mz-persist-types", + "num_cpus", + "num_enum", + "prometheus", "serde", "serde_json", - "tempfile", "timely", "tokio", "tracing", "uuid", + "workspace-hack", ] [[package]] -name = "persist-types" -version = "0.0.0" - -[[package]] -name = "pgrepr" -version = "0.0.0" +name = "petgraph" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" dependencies = [ - "byteorder", - "bytes", - "chrono", - "dec", - "lazy_static", - "ore", - "postgres-types", - "repr", - "uuid", -] - -[[package]] -name = "pgtest" -version = "0.0.0" -dependencies = [ - "anyhow", - "bytes", - "clap", - "datadriven", - "fallible-iterator", - "ore", - "postgres-protocol", - "serde", - "serde_json", -] - -[[package]] -name = "pgwire" -version = "0.0.0" -dependencies = [ - "anyhow", - "async-trait", - "byteorder", - "bytes", - "chrono", - "coord", - "csv", - "dataflow-types", - "expr", - "futures", - "itertools", - "lazy_static", - "openssl", - "ordered-float", - "ore", - "pgrepr", - "postgres", - "repr", - "sql", - "tokio", - "tokio-openssl", - "tokio-stream", - "tokio-util", - "tracing", + "fixedbitset", + "indexmap 1.9.1", ] [[package]] name = "phf" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" dependencies = [ "phf_shared", ] [[package]] name = "phf_codegen" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" dependencies = [ "phf_generator", "phf_shared", @@ -3450,9 +6792,9 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +checksum = "5b450720b6f75cfbfabc195814bd3765f337a4f9a83186f8537297cac12f6705" dependencies = [ "phf_shared", "rand", @@ -3460,49 +6802,39 @@ dependencies = [ [[package]] name = "phf_shared" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" dependencies = [ "siphasher", "uncased", ] -[[package]] -name = "pid-file" -version = "0.0.0" -dependencies = [ - "cc", - "libc", - "ore", - "tempfile", -] - [[package]] name = "pin-project" -version = "1.0.10" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" +checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.10" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" +checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] name = "pin-project-lite" -version = "0.2.7" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -3516,6 +6848,15 @@ version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c9b1041b4387893b91ee6746cddfc28516aff326a3519fb2adf820932c5e6cb" +[[package]] +name = "planus" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1691dd09e82f428ce8d6310bd6d5da2557c82ff17694d2a32cad7242aea89f" +dependencies = [ + "array-init-cursor", +] + [[package]] name = "plotters" version = "0.3.1" @@ -3544,14 +6885,20 @@ dependencies = [ "plotters-backend", ] +[[package]] +name = "portable-atomic" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16" + [[package]] name = "postgres" -version = "0.19.1" -source = "git+https://github.com/MaterializeInc/rust-postgres?branch=mz-0.7.2#4320cb7a1fedb1b6157f0dec51f84f4c990f4d98" +version = "0.19.5" +source = "git+https://github.com/MaterializeInc/rust-postgres#b759caa33610403aa74b1cfdd37f45eb3100c9af" dependencies = [ "bytes", "fallible-iterator", - "futures", + "futures-util", "log", "tokio", "tokio-postgres", @@ -3560,9 +6907,8 @@ dependencies = [ [[package]] name = "postgres-openssl" version = "0.5.0" -source = "git+https://github.com/MaterializeInc/rust-postgres?branch=mz-0.7.2#4320cb7a1fedb1b6157f0dec51f84f4c990f4d98" +source = "git+https://github.com/MaterializeInc/rust-postgres#b759caa33610403aa74b1cfdd37f45eb3100c9af" dependencies = [ - "futures", "openssl", "tokio", "tokio-openssl", @@ -3571,10 +6917,10 @@ dependencies = [ [[package]] name = "postgres-protocol" -version = "0.6.1" -source = "git+https://github.com/MaterializeInc/rust-postgres?branch=mz-0.7.2#4320cb7a1fedb1b6157f0dec51f84f4c990f4d98" +version = "0.6.5" +source = "git+https://github.com/MaterializeInc/rust-postgres#b759caa33610403aa74b1cfdd37f45eb3100c9af" dependencies = [ - "base64", + "base64 0.21.5", "byteorder", "bytes", "fallible-iterator", @@ -3588,8 +6934,8 @@ dependencies = [ [[package]] name = "postgres-types" -version = "0.2.1" -source = "git+https://github.com/MaterializeInc/rust-postgres?branch=mz-0.7.2#4320cb7a1fedb1b6157f0dec51f84f4c990f4d98" +version = "0.2.5" +source = "git+https://github.com/MaterializeInc/rust-postgres#b759caa33610403aa74b1cfdd37f45eb3100c9af" dependencies = [ "bytes", "chrono", @@ -3600,23 +6946,10 @@ dependencies = [ "uuid", ] -[[package]] -name = "postgres-util" -version = "0.0.0" -dependencies = [ - "anyhow", - "openssl", - "postgres-openssl", - "repr", - "sql-parser", - "tokio", - "tokio-postgres", -] - [[package]] name = "postgres_array" version = "0.11.0" -source = "git+https://github.com/MaterializeInc/rust-postgres-array?branch=mz-0.7.2#c84fa6fc9e0cfdeb731a83d577f579ba1598ff4d" +source = "git+https://github.com/MaterializeInc/rust-postgres-array#f58d0101e5198e04e8692629018d9b58f8543534" dependencies = [ "bytes", "fallible-iterator", @@ -3626,17 +6959,17 @@ dependencies = [ [[package]] name = "pprof" -version = "0.6.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55f35f865aa964be21fcde114cbd1cfbd9bf8a471460ed965b0f84f96c711401" +checksum = "196ded5d4be535690899a4631cc9f18cdc41b7ebf24a79400f46f48e49a11059" dependencies = [ "backtrace", "cfg-if", "findshlibs", - "lazy_static", "libc", "log", "nix", + "once_cell", "parking_lot", "smallvec", "symbolic-demangle", @@ -3652,9 +6985,9 @@ checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" [[package]] name = "predicates" -version = "2.1.0" +version = "2.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95e5a7689e456ab905c22c2b48225bb921aba7c8dfa58440d68ba13f6222a715" +checksum = "f54fc5dc63ed3bbf19494623db4f3af16842c0d975818e469022d09e53f0aa05" dependencies = [ "difflib", "float-cmp", @@ -3681,19 +7014,62 @@ dependencies = [ ] [[package]] -name = "pretty-hex" -version = "0.1.1" +name = "pretty" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be91bcc43e73799dc46a6c194a55e7aae1d86cc867c860fd4a436019af21bd8c" +checksum = "b55c4d17d994b637e2f4daf6e5dc5d660d209d5642377d675d7a1c3ab69fa579" +dependencies = [ + "arrayvec", + "typed-arena", + "unicode-width", +] + +[[package]] +name = "pretty-hex" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" + +[[package]] +name = "pretty_assertions" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +dependencies = [ + "ctor", + "diff", + "output_vt100", + "yansi", +] + +[[package]] +name = "prettyplease" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" +dependencies = [ + "proc-macro2", + "syn 1.0.107", +] + +[[package]] +name = "prettyplease" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058" +dependencies = [ + "proc-macro2", + "syn 2.0.39", +] [[package]] name = "proc-macro-crate" -version = "1.0.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ - "thiserror", - "toml", + "once_cell", + "toml_edit", ] [[package]] @@ -3705,7 +7081,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.107", "version_check", ] @@ -3728,60 +7104,33 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.36" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ - "unicode-xid", -] - -[[package]] -name = "procfs" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0941606b9934e2d98a3677759a971756eb821f75764d0e0d26946d08e74d9104" -dependencies = [ - "bitflags", - "byteorder", - "hex", - "lazy_static", - "libc", -] - -[[package]] -name = "prof" -version = "0.0.0" -dependencies = [ - "anyhow", - "backtrace", - "lazy_static", - "pprof", - "serde", - "tempfile", - "tikv-jemalloc-ctl", - "tokio", + "unicode-ident", ] [[package]] name = "prometheus" -version = "0.10.0" -source = "git+https://github.com/MaterializeInc/rust-prometheus.git#8bd8207fd0ac3ebb594a0832e5e5a70ddd8e1a60" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" dependencies = [ "cfg-if", "fnv", "lazy_static", + "memchr", "parking_lot", - "regex", "thiserror", ] [[package]] name = "proptest" version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0d9cc07f18492d879586c92b485def06bc850da3118075cd45d50e9c95b0e5" +source = "git+https://github.com/MaterializeInc/proptest.git#4d8c406c32260484747c828050016de599b9f3a4" dependencies = [ - "bitflags", + "bitflags 1.3.2", "byteorder", "lazy_static", "num-traits", @@ -3793,46 +7142,106 @@ dependencies = [ ] [[package]] -name = "protobuf" -version = "3.0.0-alpha.2" -source = "git+https://github.com/MaterializeInc/rust-protobuf.git#063964a8ab6fee98a9622a0c0a72a9765411025a" - -[[package]] -name = "protobuf-codegen" -version = "3.0.0-alpha.2" -source = "git+https://github.com/MaterializeInc/rust-protobuf.git#063964a8ab6fee98a9622a0c0a72a9765411025a" +name = "proptest-derive" +version = "0.3.0" +source = "git+https://github.com/MaterializeInc/proptest.git#4d8c406c32260484747c828050016de599b9f3a4" dependencies = [ - "anyhow", - "protobuf", - "protobuf-parse", - "protoc", - "tempfile", - "thiserror", + "proc-macro2", + "quote", + "syn 1.0.107", ] [[package]] -name = "protobuf-parse" -version = "3.0.0-alpha.2" -source = "git+https://github.com/MaterializeInc/rust-protobuf.git#063964a8ab6fee98a9622a0c0a72a9765411025a" +name = "prost" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ - "anyhow", - "protobuf", - "protoc", - "tempfile", - "thiserror", + "bytes", + "prost-derive", ] [[package]] -name = "protoc" -version = "3.0.0-alpha.2" -source = "git+https://github.com/MaterializeInc/rust-protobuf.git#063964a8ab6fee98a9622a0c0a72a9765411025a" +name = "prost-build" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ - "anyhow", + "bytes", + "heck", + "itertools", + "lazy_static", "log", - "thiserror", + "multimap", + "petgraph", + "prettyplease 0.1.25", + "prost", + "prost-types", + "regex", + "syn 1.0.107", + "tempfile", "which", ] +[[package]] +name = "prost-derive" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "prost-reflect" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "000e1e05ebf7b26e1eba298e66fe4eee6eb19c567d0ffb35e0dd34231cdac4c8" +dependencies = [ + "base64 0.21.5", + "once_cell", + "prost", + "prost-types", + "serde", + "serde-value", +] + +[[package]] +name = "prost-types" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +dependencies = [ + "prost", +] + +[[package]] +name = "protobuf-native" +version = "0.2.1+3.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86df76d0f2a6933036e8a9f28f1adc8b48081fa681dba07eaa30ac75663f7f4e" +dependencies = [ + "cxx", + "cxx-build", + "paste", + "pretty_assertions", + "protobuf-src", + "tempfile", +] + +[[package]] +name = "protobuf-src" +version = "1.1.0+21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7ac8852baeb3cc6fb83b93646fb93c0ffe5d14bf138c945ceb4b9948ee0e3c1" +dependencies = [ + "autotools", +] + [[package]] name = "psm" version = "0.1.16" @@ -3843,52 +7252,40 @@ dependencies = [ ] [[package]] -name = "pubnub-core" -version = "0.1.0" -source = "git+https://github.com/MaterializeInc/pubnub-rust#9da4f3e71b84a9200881612642cf4d18c078e169" +name = "pulldown-cmark" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34f197a544b0c9ab3ae46c359a7ec9cbbb5c7bf97054266fecb7ead794a181d6" dependencies = [ - "async-trait", - "bitflags", - "error-iter", - "futures-channel", - "futures-core", - "futures-util", - "json", - "log", - "percent-encoding", - "thiserror", - "uuid", + "bitflags 1.3.2", + "memchr", + "unicase", ] [[package]] -name = "pubnub-hyper" -version = "0.1.0" -source = "git+https://github.com/MaterializeInc/pubnub-rust#9da4f3e71b84a9200881612642cf4d18c078e169" +name = "qcell" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f6c04aa3dea4dab485f6d87449ba94d5664c388c0f1fe2b07c4891175513345" dependencies = [ - "async-trait", - "derive_builder", - "error-iter", - "futures-util", - "getset", - "http", - "hyper", - "hyper-tls", - "log", - "pubnub-core", - "pubnub-util", - "thiserror", - "tokio", + "exclusion-set", + "once_cell", ] [[package]] -name = "pubnub-util" -version = "0.1.0" -source = "git+https://github.com/MaterializeInc/pubnub-rust#9da4f3e71b84a9200881612642cf4d18c078e169" +name = "quanta" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab" dependencies = [ - "base64", - "hmac", - "sha2", - "uritemplate-next", + "crossbeam-utils", + "libc", + "mach2", + "once_cell", + "raw-cpuid", + "wasi", + "web-sys", + "winapi", ] [[package]] @@ -3898,24 +7295,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ac73b1112776fc109b2e61909bc46c7e1bf0d7f690ffb1676553acce16d5cda" [[package]] -name = "quote" -version = "1.0.14" +name = "quick-xml" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] +name = "quickcheck" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" +dependencies = [ + "rand", +] + +[[package]] +name = "quote" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" dependencies = [ "proc-macro2", ] [[package]] -name = "rand" -version = "0.8.4" +name = "radium" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha", "rand_core", - "rand_hc", + "serde", ] [[package]] @@ -3935,25 +7356,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" dependencies = [ "getrandom", -] - -[[package]] -name = "rand_distr" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "964d548f8e7d12e102ef183a0de7e98180c9f8729f555897a857b96e48122d2f" -dependencies = [ - "num-traits", - "rand", -] - -[[package]] -name = "rand_hc" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" -dependencies = [ - "rand_core", + "serde", ] [[package]] @@ -3965,6 +7368,15 @@ dependencies = [ "rand_core", ] +[[package]] +name = "raw-cpuid" +version = "10.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "rayon" version = "1.5.1" @@ -3992,10 +7404,11 @@ dependencies = [ [[package]] name = "rdkafka" -version = "0.28.0" -source = "git+https://github.com/fede1024/rust-rdkafka.git#a640a003fc957be0c43ab6b43f768c03df32db67" +version = "0.29.0" +source = "git+https://github.com/MaterializeInc/rust-rdkafka.git#8ea07c4d2b96636ff093e670bc921892aee0d56a" dependencies = [ - "futures", + "futures-channel", + "futures-util", "libc", "log", "rdkafka-sys", @@ -4008,8 +7421,8 @@ dependencies = [ [[package]] name = "rdkafka-sys" -version = "4.2.0+1.8.2" -source = "git+https://github.com/fede1024/rust-rdkafka.git#a640a003fc957be0c43ab6b43f768c03df32db67" +version = "4.3.0+1.9.2" +source = "git+https://github.com/MaterializeInc/rust-rdkafka.git#8ea07c4d2b96636ff093e670bc921892aee0d56a" dependencies = [ "cmake", "libc", @@ -4017,24 +7430,42 @@ dependencies = [ "num_enum", "openssl-sys", "pkg-config", - "sasl2-sys", "zstd-sys", ] [[package]] name = "redox_syscall" -version = "0.2.4" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ec8ca9416c5ea37062b502703cd7fcb207736bc294f6e0cf367ac6fc234570" +checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" dependencies = [ - "bitflags", + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" +dependencies = [ + "getrandom", + "redox_syscall 0.2.10", ] [[package]] name = "regex" -version = "1.5.4" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" dependencies = [ "aho-corasick", "memchr", @@ -4051,90 +7482,47 @@ dependencies = [ "regex-syntax", ] +[[package]] +name = "regex-automata" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" + +[[package]] +name = "regex-lite" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" + [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" - -[[package]] -name = "remove_dir_all" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" -dependencies = [ - "winapi", -] - -[[package]] -name = "repr" -version = "0.0.0" -dependencies = [ - "anyhow", - "byteorder", - "chrono", - "chrono-tz", - "criterion", - "dec", - "enum-kinds", - "fast-float", - "hex", - "itertools", - "lazy_static", - "lowertest", - "mz-protoc", - "num-traits", - "num_enum", - "ordered-float", - "ore", - "persist-types", - "proptest", - "protobuf", - "rand", - "regex", - "ryu", - "serde", - "serde_json", - "serde_regex", - "smallvec", - "uuid", -] - -[[package]] -name = "repr_test_util" -version = "0.0.0" -dependencies = [ - "chrono", - "datadriven", - "lazy_static", - "lowertest", - "ore", - "proc-macro2", - "repr", -] +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "reqwest" -version = "0.11.8" +version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c4e0a76dc12a116108933f6301b95e83634e0c47b0afbed6abbaa0601e99258" +checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "encoding_rs", "futures-core", "futures-util", + "h2", "http", "http-body", "hyper", "hyper-tls", "ipnet", "js-sys", - "lazy_static", "log", "mime", "mime_guess", "native-tls", + "once_cell", "percent-encoding", "pin-project-lite", "serde", @@ -4142,6 +7530,7 @@ dependencies = [ "serde_urlencoded", "tokio", "tokio-native-tls", + "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", @@ -4150,42 +7539,116 @@ dependencies = [ ] [[package]] -name = "ring" -version = "0.16.20" +name = "reqwest-middleware" +version = "0.2.3" +source = "git+https://github.com/MaterializeInc/reqwest-middleware.git#1c44c7ddbf4954cc2d4de73a760b9a8d84827349" +dependencies = [ + "anyhow", + "async-trait", + "http", + "reqwest", + "serde", + "task-local-extensions", + "thiserror", +] + +[[package]] +name = "reqwest-retry" +version = "0.2.2" +source = "git+https://github.com/MaterializeInc/reqwest-middleware.git#1c44c7ddbf4954cc2d4de73a760b9a8d84827349" +dependencies = [ + "anyhow", + "async-trait", + "chrono", + "futures", + "http", + "hyper", + "reqwest", + "reqwest-middleware", + "retry-policies", + "task-local-extensions", + "tokio", + "tracing", +] + +[[package]] +name = "retain_mut" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0" + +[[package]] +name = "retry-policies" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e09bbcb5003282bcb688f0bae741b278e9c7e8f378f561522c9806c58e075d9b" +dependencies = [ + "anyhow", + "chrono", + "rand", +] + +[[package]] +name = "ring" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", + "getrandom", "libc", - "once_cell", "spin", "untrusted", - "web-sys", - "winapi", + "windows-sys 0.48.0", ] [[package]] name = "rlimit" -version = "0.6.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc0bf25554376fd362f54332b8410a625c71f15445bca32ffdfdf4ec9ac91726" +checksum = "f7278a1ec8bfd4a4e07515c589f5ff7b309a373f987393aef44813d9dcf87aa3" dependencies = [ "libc", ] [[package]] -name = "rusqlite" -version = "0.26.3" +name = "rocksdb" +version = "0.21.0" +source = "git+https://github.com/MaterializeInc/rust-rocksdb?branch=master#3305d514d509c6b95b0c925c78157e5e4ae4b7ba" +dependencies = [ + "libc", + "librocksdb-sys", +] + +[[package]] +name = "ropey" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ba4d3462c8b2e4d7f4fcfcf2b296dc6b65404fbbc7b63daa37fd485c149daf7" +checksum = "53ce7a2c43a32e50d666e33c5a80251b31147bb4b49024bcab11fb6f20c671ed" dependencies = [ - "bitflags", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "memchr", "smallvec", + "str_indices", +] + +[[package]] +name = "rpassword" +version = "7.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" +dependencies = [ + "libc", + "rtoolbox", + "winapi", +] + +[[package]] +name = "rtoolbox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" +dependencies = [ + "libc", + "winapi", ] [[package]] @@ -4194,6 +7657,12 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + [[package]] name = "rustc_version" version = "0.4.0" @@ -4204,28 +7673,44 @@ dependencies = [ ] [[package]] -name = "ryu" -version = "1.0.9" +name = "rustix" +version = "0.37.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" +checksum = "a0661814f891c57c930a610266415528da53c4933e6dea5fb350cbfe048a9ece" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.4", + "windows-sys 0.48.0", +] [[package]] -name = "s3-datagen" -version = "0.0.0" +name = "rustix" +version = "0.38.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" dependencies = [ - "anyhow", - "aws-sdk-s3", - "bytefmt", - "clap", - "futures", - "indicatif", - "mz-aws-util", - "ore", - "tokio", - "tracing", - "tracing-subscriber", + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys 0.4.12", + "windows-sys 0.48.0", ] +[[package]] +name = "rustversion" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" + +[[package]] +name = "ryu" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" + [[package]] name = "same-file" version = "1.0.4" @@ -4236,17 +7721,10 @@ dependencies = [ ] [[package]] -name = "sasl2-sys" -version = "0.1.16" +name = "saturating" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c50936b766924ec8f5118bcd3d6e5dc7ac25263df4f2ea450fe7919281a4544" -dependencies = [ - "cc", - "duct", - "krb5-src", - "libc", - "pkg-config", -] +checksum = "ece8e78b2f38ec51c51f5d475df0a7187ba5111b2a28bdc761ee05b075d40a71" [[package]] name = "schannel" @@ -4258,6 +7736,46 @@ dependencies = [ "winapi", ] +[[package]] +name = "scheduled-thread-pool" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "977a7519bff143a44f842fd07e80ad1329295bd71686457f18e496736f4bf9bf" +dependencies = [ + "parking_lot", +] + +[[package]] +name = "schemars" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a5fb6c61f29e723026dc8e923d94c694313212abbecbbe5f55a7748eec5b307" +dependencies = [ + "dyn-clone", + "schemars_derive", + "serde", + "serde_json", + "uuid", +] + +[[package]] +name = "schemars_derive" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f188d036977451159430f3b8dc82ec76364a42b7e289c2b18a9a18f4470058e9" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 1.0.107", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + [[package]] name = "scopeguard" version = "1.1.0" @@ -4265,12 +7783,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "security-framework" -version = "2.0.0" +name = "scratch" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1759c2e3c8580017a484a7ac56d3abc5a6c1feadf88db2f3633f12ae4268c69" +checksum = "96311ef4a16462c757bb6a39152c40f58f31cd2602a40fceb937e2bc34e6cbab" + +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + +[[package]] +name = "sec1" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" dependencies = [ - "bitflags", + "der", + "generic-array", +] + +[[package]] +name = "secrecy" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" +dependencies = [ + "serde", + "zeroize", +] + +[[package]] +name = "security-framework" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +dependencies = [ + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -4279,61 +7829,240 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.0.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f99b9d5e26d2a71633cc4f2ebae7cc9f874044e0c351a27e17892d76dce5678b" +checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" dependencies = [ "core-foundation-sys", "libc", ] [[package]] -name = "semver" -version = "1.0.4" +name = "segment" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" +checksum = "24fc91c898e0487ff3e471d0849bbaf7d38a00ff5e3531009d386b0bab9b6b12" +dependencies = [ + "async-trait", + "reqwest", + "serde", + "serde_json", + "thiserror", + "time", +] + +[[package]] +name = "semver" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" +dependencies = [ + "serde", +] + +[[package]] +name = "sendfd" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604b71b8fc267e13bb3023a2c901126c8f349393666a6d98ac1ae5729b701798" +dependencies = [ + "libc", + "tokio", +] + +[[package]] +name = "sentry" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ad137b9df78294b98cab1a650bef237cc6c950e82e5ce164655e674d07c5cc" +dependencies = [ + "httpdate", + "native-tls", + "reqwest", + "sentry-backtrace", + "sentry-contexts", + "sentry-core", + "sentry-debug-images", + "sentry-panic", + "tokio", + "ureq", +] + +[[package]] +name = "sentry-backtrace" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afe4800806552aab314129761d5d3b3d422284eca3de2ab59e9fd133636cbd3d" +dependencies = [ + "backtrace", + "once_cell", + "regex", + "sentry-core", +] + +[[package]] +name = "sentry-contexts" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a42938426670f6e7974989cd1417837a96dd8bbb01567094f567d6acb360bf88" +dependencies = [ + "hostname", + "libc", + "os_info", + "rustc_version", + "sentry-core", + "uname", +] + +[[package]] +name = "sentry-core" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4df9b9d8de2658a1ecd4e45f7b06c80c5dd97b891bfbc7c501186189b7e9bbdf" +dependencies = [ + "once_cell", + "rand", + "sentry-types", + "serde", + "serde_json", +] + +[[package]] +name = "sentry-debug-images" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3995208135571444b7d5a247f42bd36677553bb64185d85b317acdc1789749b3" +dependencies = [ + "findshlibs", + "once_cell", + "sentry-core", +] + +[[package]] +name = "sentry-panic" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0af37b8500f273e511ebd6eb0d342ff7937d64ce3f134764b2b4653112d48cb4" +dependencies = [ + "sentry-backtrace", + "sentry-core", +] + +[[package]] +name = "sentry-tracing" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63fc83ec2cf38726bd18cb1943ff11555b07fd5034cb68b10958ab32e2863a1f" +dependencies = [ + "sentry-core", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "sentry-types" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccc95faa4078768a6bf8df45e2b894bbf372b3dbbfb364e9429c1c58ab7545c6" +dependencies = [ + "debugid", + "getrandom", + "hex", + "serde", + "serde_json", + "thiserror", + "time", + "url", + "uuid", +] + +[[package]] +name = "seq-macro" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0772c5c30e1a0d91f6834f8e545c69281c099dfa9a3ac58d96a9fd629c8d4898" [[package]] name = "serde" -version = "1.0.133" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a" +checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" dependencies = [ "serde_derive", ] [[package]] -name = "serde_cbor" -version = "0.11.1" +name = "serde-aux" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622" +checksum = "c3dfe1b7eb6f9dcf011bd6fad169cdeaae75eda0d61b1a99a3f015b41b0cae39" dependencies = [ - "half", + "chrono", + "serde", + "serde_json", +] + +[[package]] +name = "serde-value" +version = "0.7.0" +source = "git+https://github.com/MaterializeInc/serde-value.git#a84c6b71825efaffb332c0d19f18c2bdf9ee7b40" +dependencies = [ + "ordered-float", "serde", ] [[package]] name = "serde_derive" -version = "1.0.133" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537" +checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", +] + +[[package]] +name = "serde_derive_internals" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", ] [[package]] name = "serde_json" -version = "1.0.74" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142" +checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" dependencies = [ - "itoa 1.0.1", + "indexmap 2.0.0", + "itoa", "ryu", "serde", ] +[[package]] +name = "serde_path_to_error" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "184c643044780f7ceb59104cef98a5a6f12cb2288a7bc701ab93a362b49fd47d" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_plain" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6018081315db179d0ce57b1fe4b62a12a0028c9cf9bbef868c9cf477b3c34ae" +dependencies = [ + "serde", +] + [[package]] name = "serde_regex" version = "1.1.0" @@ -4345,22 +8074,83 @@ dependencies = [ ] [[package]] -name = "serde_urlencoded" -version = "0.7.0" +name = "serde_repr" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" +checksum = "6f0a21fba416426ac927b1691996e82079f8b6156e920c85345f135b2e9ba2de" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "serde_spanned" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 0.4.6", + "itoa", "ryu", "serde", ] [[package]] -name = "sha-1" -version = "0.10.0" +name = "serde_with" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" +checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" +dependencies = [ + "base64 0.13.1", + "chrono", + "hex", + "indexmap 1.9.1", + "serde", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "serde_yaml" +version = "0.9.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" +dependencies = [ + "indexmap 2.0.0", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[package]] +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if", "cpufeatures", @@ -4368,10 +8158,16 @@ dependencies = [ ] [[package]] -name = "sha2" -version = "0.10.1" +name = "sha1_smol" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99c3bd8169c58782adad9290a9af5939994036b76187f7b4f0e6de91dbbfc0ec" +checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" + +[[package]] +name = "sha2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if", "cpufeatures", @@ -4380,39 +8176,46 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.1" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79c719719ee05df97490f80a45acfc99e5a30ce98a1e4fb67aee422745ae14e3" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" dependencies = [ "lazy_static", ] [[package]] -name = "shared_child" -version = "0.3.4" +name = "shell-escape" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cebcf3a403e4deafaf34dc882c4a1b6a648b43e5670aa2e4bb985914eaeb2d2" -dependencies = [ - "libc", - "winapi", -] +checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" [[package]] name = "shell-words" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6fa3938c99da4914afedd13bf3d79bcb6c277d1b2c398d23257a304d9e1b074" +checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" + +[[package]] +name = "shlex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "signal-hook-registry" -version = "1.2.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ - "arc-swap", "libc", ] +[[package]] +name = "signature" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f054c6c1a6e95179d6f23ed974060dcefb2d9388bb7256900badad682c499de4" + [[package]] name = "simdutf8" version = "0.1.3" @@ -4421,9 +8224,35 @@ checksum = "c970da16e7c682fa90a261cf0724dee241c9f7831635ecc4e988ae8f3b505559" [[package]] name = "similar" -version = "2.1.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e24979f63a11545f5f2c60141afe249d4f19f84581ea2138065e400941d83d3" +checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" +dependencies = [ + "bstr 0.2.14", + "unicode-segmentation", +] + +[[package]] +name = "similar-asserts" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbf644ad016b75129f01a34a355dcb8d66a5bc803e417c7a77cc5d5ee9fa0f18" +dependencies = [ + "console", + "similar", +] + +[[package]] +name = "simple_asn1" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a762b1c38b9b990c694b9c2f8abe3372ce6a9ceaae6bca39cfc46e054f45745" +dependencies = [ + "num-bigint", + "num-traits", + "thiserror", + "time", +] [[package]] name = "siphasher" @@ -4432,136 +8261,89 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa8f3741c7372e75519bd9346068370c9cdaabcc1f9599cbcf2a2719352286b7" [[package]] -name = "slab" -version = "0.4.2" +name = "skeptic" +version = "0.13.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" +checksum = "16d23b015676c90a0f01c197bfdc786c20342c73a0afdda9025adb0bc42940a8" +dependencies = [ + "bytecount", + "cargo_metadata", + "error-chain", + "glob", + "pulldown-cmark", + "tempfile", + "walkdir", +] + +[[package]] +name = "slab" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" [[package]] name = "smallvec" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" dependencies = [ "serde", ] [[package]] name = "snap" -version = "1.0.5" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45456094d1983e2ee2a18fdfebce3189fa451699d0502cb8e3b49dba5ba41451" +checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" [[package]] name = "socket2" -version = "0.4.0" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", ] [[package]] -name = "spin" -version = "0.5.2" +name = "socket2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] [[package]] -name = "sql" -version = "0.0.0" +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "ssh-key" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f02d3730e8785e797a4552137d1acc0d7f7146dad3b5fe65ed83637711dfc6c5" +dependencies = [ + "base64ct", + "pem-rfc7468", + "rand_core", + "sec1", + "sha2", + "signature", + "zeroize", +] + +[[package]] +name = "ssh_format" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8701239872766d43b8a5f9a560ff7f002b48064fadea87f44a70507069fb482" dependencies = [ - "anyhow", - "aws-arn", - "build-info", - "ccsr", - "chrono", - "csv", - "datadriven", - "dataflow-types", - "dec", - "enum-kinds", - "expr", - "expr_test_util", - "futures", - "globset", - "interchange", - "itertools", - "kafka-util", - "lazy_static", - "lowertest", - "mz-avro", - "mz-aws-util", - "mz-protoc", - "ore", - "pgrepr", - "postgres-protocol", - "postgres-types", - "postgres-util", - "protobuf", - "rdkafka", - "regex", - "repr", - "reqwest", "serde", - "serde_json", - "sql-parser", - "tempfile", - "tokio", - "tokio-postgres", - "tracing", - "uncased", - "url", - "uuid", -] - -[[package]] -name = "sql-parser" -version = "0.0.0" -dependencies = [ - "anyhow", - "datadriven", - "enum-kinds", - "hex", - "itertools", - "lazy_static", - "ore", - "phf", - "phf_codegen", - "tracing", - "uncased", - "unicode-width", - "walkabout", -] - -[[package]] -name = "sqllogictest" -version = "0.0.1" -dependencies = [ - "anyhow", - "chrono", - "clap", - "coord", - "expr", - "fallible-iterator", - "futures", - "lazy_static", - "materialized", - "md-5", - "ore", - "pgrepr", - "postgres-protocol", - "regex", - "repr", - "serde_json", - "sql", - "tempfile", - "timely", - "tokio", - "tokio-postgres", - "uuid", - "walkdir", ] [[package]] @@ -4572,9 +8354,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "stacker" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90939d5171a4420b3ff5fbc8954d641e7377335454c259dcb80786f3f21dc9b4" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" dependencies = [ "cc", "cfg-if", @@ -4589,6 +8371,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "str_indices" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f026164926842ec52deb1938fae44f83dfdb82d0a5b0270c5bd5935ab74d6dd" + [[package]] name = "streaming-decompression" version = "0.1.0" @@ -4598,6 +8386,12 @@ dependencies = [ "fallible-streaming-iterator", ] +[[package]] +name = "streaming-iterator" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "303235c177994a476226b80d076bd333b7b560fb05bd242a10609d11b07f81f5" + [[package]] name = "stringprep" version = "0.1.2" @@ -4608,12 +8402,31 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "strip-ansi-escapes" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ff8ef943b384c414f54aefa961dd2bd853add74ec75e7ac74cf91dba62bcfa" +dependencies = [ + "vte", +] + [[package]] name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "subprocess" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c2e86926081dda636c546d8c5e641661049d7562a68f5488be4a1f7f66f6086" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "subtle" version = "2.4.1" @@ -4622,21 +8435,21 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "symbolic-common" -version = "8.0.0" +version = "10.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0caab39ce6f074031b8fd3dd297bfda70a2d1f33c6e7cc1b737ac401f856448d" +checksum = "c5d7c8cd6663e22c348c74cf0b2c77d196fd252c7efe5594ae05edb07d0475da" dependencies = [ "debugid", - "memmap", + "memmap2", "stable_deref_trait", "uuid", ] [[package]] name = "symbolic-demangle" -version = "8.0.0" +version = "10.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b77ecb5460a87faa37ed53521eed8f073c8339b7a5788c1f93efc09ce74e1b68" +checksum = "86dc78e43163d342e72c0175113cf0c6ffc6b2540163c8680c4ed91c992af9e2" dependencies = [ "cpp_demangle", "rustc-demangle", @@ -4645,15 +8458,32 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.85" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" + [[package]] name = "synstructure" version = "0.12.3" @@ -4662,18 +8492,19 @@ checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", "unicode-xid", ] [[package]] name = "sysctl" -version = "0.4.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb3f7a32e17639e3705d2e05da40f485877cb97fdf0f3240e519e525e6cdb4d" +checksum = "ed66d6a2ccbd656659289bc90767895b7abbdec897a0fc6031aca3ed1cb51d3e" dependencies = [ - "bitflags", + "bitflags 1.3.2", "byteorder", + "enum-as-inner", "libc", "thiserror", "walkdir", @@ -4681,9 +8512,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.22.5" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f1bfab07306a27332451a662ca9c8156e3a9986f82660ba9c8e744fe8455d43" +checksum = "17351d0e9eb8841897b14e9669378f3c69fb57779cc04f8ca9a9d512edfb2563" dependencies = [ "cfg-if", "core-foundation-sys", @@ -4694,6 +8525,42 @@ dependencies = [ "winapi", ] +[[package]] +name = "tabled" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c3ee73732ffceaea7b8f6b719ce3bb17f253fa27461ffeaf568ebd0cdb4b85" +dependencies = [ + "papergrid", + "tabled_derive", + "unicode-width", +] + +[[package]] +name = "tabled_derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "beca1b4eaceb4f2755df858b88d9b9315b7ccfd1ffd0d7a48a52602301f01a57" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "tagptr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + [[package]] name = "tar" version = "0.4.38" @@ -4706,157 +8573,90 @@ dependencies = [ ] [[package]] -name = "tempfile" -version = "3.2.0" +name = "task-local-extensions" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" +checksum = "ba323866e5d033818e3240feeb9f7db2c4296674e4d9e16b97b7bf8f490434e8" +dependencies = [ + "pin-utils", +] + +[[package]] +name = "tempfile" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", - "libc", - "rand", - "redox_syscall", - "remove_dir_all", - "winapi", + "fastrand", + "redox_syscall 0.4.1", + "rustix 0.38.21", + "windows-sys 0.48.0", ] [[package]] name = "termcolor" -version = "1.1.2" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] [[package]] name = "terminal_size" -version = "0.1.16" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ca8ced750734db02076f44132d802af0b33b09942331f4459dde8636fd2406" +checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "test-util" -version = "0.0.0" -dependencies = [ - "anyhow", - "chrono", - "kafka-util", - "ore", - "rand", - "rdkafka", - "tokio", - "tokio-postgres", - "tracing", -] - -[[package]] -name = "testdrive" -version = "0.0.0" -dependencies = [ - "assert_cmd", - "async-compression", - "async-trait", - "atty", - "aws-config", - "aws-sdk-kinesis", - "aws-sdk-s3", - "aws-sdk-sqs", - "aws-smithy-http", - "aws-types", - "byteorder", - "bytes", - "ccsr", - "chrono", - "clap", - "coord", - "flate2", - "futures", - "http", - "interchange", - "itertools", - "kafka-util", - "krb5-src", - "lazy_static", - "maplit", - "md-5", - "mz-avro", - "mz-aws-util", - "mz-protoc", - "ore", - "pgrepr", - "postgres_array", - "predicates", - "protobuf", - "rand", - "rdkafka", - "regex", - "repr", - "reqwest", - "serde", - "serde_json", - "similar", - "sql", - "sql-parser", - "tempfile", - "termcolor", - "tiberius", - "tokio", - "tokio-postgres", - "tokio-stream", - "tokio-util", - "url", - "uuid", + "rustix 0.37.15", + "windows-sys 0.48.0", ] [[package]] name = "textwrap" -version = "0.14.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" dependencies = [ "terminal_size", ] [[package]] name = "thiserror" -version = "1.0.30" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.30" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] name = "thread_local" -version = "1.0.1" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" dependencies = [ - "lazy_static", + "once_cell", ] [[package]] name = "tiberius" -version = "0.7.1" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00035fdbcee3e791e756d1831a1b9a89e414c320d3eccdae65aba4f388216c30" +checksum = "66303a42b7c5daffb95c10cd8f3007a9c29b3e90128cf42b3738f58102aa2516" dependencies = [ - "async-native-tls", "async-trait", "asynchronous-codec", "byteorder", @@ -4869,7 +8669,6 @@ dependencies = [ "futures-util", "num-traits", "once_cell", - "opentls", "pin-project-lite", "pretty-hex", "thiserror", @@ -4879,9 +8678,9 @@ dependencies = [ [[package]] name = "tikv-jemalloc-ctl" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb833c46ecbf8b6daeccb347cefcabf9c1beb5c9b0f853e1cec45632d9963e69" +checksum = "e37706572f4b151dff7a0146e040804e9c26fe3a3118591112f05cf12a4216c1" dependencies = [ "libc", "paste", @@ -4890,9 +8689,9 @@ dependencies = [ [[package]] name = "tikv-jemalloc-sys" -version = "0.4.2+5.2.1-patched.2" +version = "0.5.2+5.3.0-patched" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5844e429d797c62945a566f8da4e24c7fe3fbd5d6617fd8bf7a0b7dc1ee0f22e" +checksum = "ec45c14da997d0925c7835883e4d5c181f196fa142f8c19d7643d1e9af2592c3" dependencies = [ "cc", "fs_extra", @@ -4901,9 +8700,9 @@ dependencies = [ [[package]] name = "tikv-jemallocator" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c14a5a604eb8715bc5785018a37d00739b180bcf609916ddf4393d33d49ccdf" +checksum = "20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979" dependencies = [ "libc", "tikv-jemalloc-sys", @@ -4911,17 +8710,36 @@ dependencies = [ [[package]] name = "time" -version = "0.3.5" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41effe7cfa8af36f439fac33861b66b049edc6f9a32331e2312660529c1c24ad" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" dependencies = [ - "libc", + "itoa", + "quickcheck", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + +[[package]] +name = "time-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +dependencies = [ + "time-core", ] [[package]] name = "timely" version = "0.12.0" -source = "git+https://github.com/TimelyDataflow/timely-dataflow#1f09f660120d69f0c2534d04671b5f9d79162a39" +source = "git+https://github.com/MaterializeInc/timely-dataflow.git#de20aa88cc6df3de910e9befbe68408d31e287be" dependencies = [ "abomonation", "abomonation_derive", @@ -4932,27 +8750,19 @@ dependencies = [ "serde_derive", "timely_bytes", "timely_communication", + "timely_container", "timely_logging", ] -[[package]] -name = "timely-util" -version = "0.0.0" -dependencies = [ - "futures-util", - "timely", - "tokio", -] - [[package]] name = "timely_bytes" version = "0.12.0" -source = "git+https://github.com/TimelyDataflow/timely-dataflow#1f09f660120d69f0c2534d04671b5f9d79162a39" +source = "git+https://github.com/MaterializeInc/timely-dataflow.git#de20aa88cc6df3de910e9befbe68408d31e287be" [[package]] name = "timely_communication" version = "0.12.0" -source = "git+https://github.com/TimelyDataflow/timely-dataflow#1f09f660120d69f0c2534d04671b5f9d79162a39" +source = "git+https://github.com/MaterializeInc/timely-dataflow.git#de20aa88cc6df3de910e9befbe68408d31e287be" dependencies = [ "abomonation", "abomonation_derive", @@ -4965,10 +8775,28 @@ dependencies = [ "timely_logging", ] +[[package]] +name = "timely_container" +version = "0.12.0" +source = "git+https://github.com/MaterializeInc/timely-dataflow.git#de20aa88cc6df3de910e9befbe68408d31e287be" +dependencies = [ + "columnation", + "serde", +] + [[package]] name = "timely_logging" version = "0.12.0" -source = "git+https://github.com/TimelyDataflow/timely-dataflow#1f09f660120d69f0c2534d04671b5f9d79162a39" +source = "git+https://github.com/MaterializeInc/timely-dataflow.git#de20aa88cc6df3de910e9befbe68408d31e287be" + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] [[package]] name = "tinytemplate" @@ -4981,33 +8809,80 @@ dependencies = [ ] [[package]] -name = "tokio" -version = "1.15.0" +name = "tinyvec" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "tokio" +version = "1.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +dependencies = [ + "backtrace", "bytes", "libc", - "memchr", "mio", "num_cpus", - "once_cell", "parking_lot", "pin-project-lite", "signal-hook-registry", + "socket2 0.5.3", "tokio-macros", - "winapi", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-io-timeout" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90c49f106be240de154571dd31fbe48acb10ba6c6dd6f6517ad603abffa42de9" +dependencies = [ + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-io-utility" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d672654d175710e52c7c41f6aec77c62b3c0954e2a7ebce9049d1e94ed7c263" +dependencies = [ + "tokio", ] [[package]] name = "tokio-macros" -version = "1.7.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", +] + +[[package]] +name = "tokio-metrics" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4b2fc67d5dec41db679b9b052eb572269616926040b7831e32c8a152df77b84" +dependencies = [ + "futures-util", + "pin-project-lite", + "tokio", + "tokio-stream", ] [[package]] @@ -5032,16 +8907,27 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-pipe" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f213a84bffbd61b8fa0ba8a044b4bbe35d471d0b518867181e82bd5c15542784" +dependencies = [ + "libc", + "tokio", +] + [[package]] name = "tokio-postgres" -version = "0.7.2" -source = "git+https://github.com/MaterializeInc/rust-postgres?branch=mz-0.7.2#4320cb7a1fedb1b6157f0dec51f84f4c990f4d98" +version = "0.7.8" +source = "git+https://github.com/MaterializeInc/rust-postgres#b759caa33610403aa74b1cfdd37f45eb3100c9af" dependencies = [ "async-trait", "byteorder", "bytes", "fallible-iterator", - "futures", + "futures-channel", + "futures-util", "log", "parking_lot", "percent-encoding", @@ -5049,72 +8935,173 @@ dependencies = [ "pin-project-lite", "postgres-protocol", "postgres-types", - "socket2", + "serde", + "socket2 0.5.3", "tokio", "tokio-util", ] -[[package]] -name = "tokio-serde" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "911a61637386b789af998ee23f50aa30d5fd7edcec8d6d3dedae5e5815205466" -dependencies = [ - "bincode", - "bytes", - "educe", - "futures-core", - "futures-sink", - "pin-project", - "serde", -] - [[package]] name = "tokio-stream" -version = "0.1.8" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" +checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" dependencies = [ "futures-core", "pin-project-lite", "tokio", + "tokio-util", +] + +[[package]] +name = "tokio-test" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53474327ae5e166530d17f2d956afcb4f8a004de581b3cae10f12006bc8163e3" +dependencies = [ + "async-stream", + "bytes", + "futures-core", + "tokio", + "tokio-stream", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2dbec703c26b00d74844519606ef15d09a7d6857860f84ad223dec002ddea2" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite", ] [[package]] name = "tokio-util" -version = "0.6.9" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" +checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" dependencies = [ "bytes", "futures-core", "futures-io", "futures-sink", - "log", "pin-project-lite", + "slab", "tokio", + "tracing", ] [[package]] name = "toml" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" dependencies = [ "serde", ] [[package]] -name = "tower" -version = "0.4.10" +name = "toml_datetime" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00e500fff5fa1131c866b246041a6bf96da9c965f8fe4128cb1421f23e93c00" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tonic" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" +dependencies = [ + "async-trait", + "axum", + "base64 0.21.5", + "bytes", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost", + "tokio", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tonic-build" +version = "0.9.2" +source = "git+https://github.com/MaterializeInc/tonic?rev=0d86e360ab45779770ca150c8487fe7940c299a9#0d86e360ab45779770ca150c8487fe7940c299a9" +dependencies = [ + "prettyplease 0.1.25", + "proc-macro2", + "prost-build", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", + "indexmap 1.9.1", "pin-project", "pin-project-lite", + "rand", + "slab", "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82" +dependencies = [ + "base64 0.21.5", + "bitflags 2.4.1", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "mime", + "pin-project-lite", + "tower", "tower-layer", "tower-service", "tracing", @@ -5122,21 +9109,55 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-lsp" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4ba052b54a6627628d9b3c34c176e7eda8359b7da9acd497b9f20998d118508" +dependencies = [ + "async-trait", + "auto_impl", + "bytes", + "dashmap", + "futures", + "httparse", + "lsp-types", + "memchr", + "serde", + "serde_json", + "tokio", + "tokio-util", + "tower", + "tower-lsp-macros", + "tracing", +] + +[[package]] +name = "tower-lsp-macros" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] [[package]] name = "tower-service" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" +checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.29" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", "log", @@ -5147,68 +9168,90 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.18" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] name = "tracing-core" -version = "0.1.21" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" dependencies = [ - "lazy_static", + "once_cell", + "valuable", ] [[package]] name = "tracing-log" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ - "lazy_static", "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-opentelemetry" +version = "0.22.0" +source = "git+https://github.com/MaterializeInc/tracing-opentelemetry.git#7035e641b683985cc3b8630f3b61d53c96f83695" +dependencies = [ + "js-sys", + "once_cell", + "opentelemetry", + "opentelemetry_sdk", + "smallvec", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber", + "web-time", +] + +[[package]] +name = "tracing-serde" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +dependencies = [ + "serde", "tracing-core", ] [[package]] name = "tracing-subscriber" -version = "0.3.5" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d81bfa81424cc98cb034b837c985b7a290f592e5b4322f353f94a0ab0f9f594" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ - "ansi_term", - "lazy_static", "matchers", + "nu-ansi-term", + "once_cell", "regex", + "serde", + "serde_json", "sharded-slab", "smallvec", "thread_local", "tracing", "tracing-core", "tracing-log", + "tracing-serde", ] [[package]] -name = "transform" -version = "0.0.0" +name = "treediff" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303" dependencies = [ - "anyhow", - "datadriven", - "dataflow-types", - "differential-dataflow", - "expr", - "expr_test_util", - "itertools", - "lowertest", - "ore", - "proc-macro2", - "repr", "serde_json", ] @@ -5218,6 +9261,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" +[[package]] +name = "triomphe" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1ee9bd9239c339d714d657fac840c6d2a4f9c45f4f9ec7b0975113458be78db" + [[package]] name = "try-lock" version = "0.2.2" @@ -5225,16 +9274,72 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" [[package]] -name = "typenum" -version = "1.12.0" +name = "tungstenite" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "twox-hash" +version = "1.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0" +dependencies = [ + "cfg-if", + "rand", + "static_assertions", +] + +[[package]] +name = "typed-arena" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" + +[[package]] +name = "typed-builder" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "typenum" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" + +[[package]] +name = "uname" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" +dependencies = [ + "libc", +] [[package]] name = "uncased" -version = "0.9.6" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5baeed7327e25054889b9bd4f975f32e5f4c5d434042d59ab6cd4142c0a76ed0" +checksum = "09b01702b0fd0b3fadcf98e098780badda8742d4f4a7676615cad90e8ac73622" dependencies = [ "version_check", ] @@ -5258,76 +9363,111 @@ dependencies = [ ] [[package]] -name = "unicode-normalization" -version = "0.1.12" +name = "unicode-ident" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" +checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee" + +[[package]] +name = "unicode-normalization" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" dependencies = [ - "smallvec", + "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.6.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "unicode-xid" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[package]] +name = "unsafe-libyaml" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" [[package]] name = "untrusted" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] -name = "uritemplate-next" -version = "0.2.0" +name = "ureq" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcde98d1fc3f528255b1ecb22fb688ee0d23deb672a8c57127df10b98b4bd18c" +checksum = "b97acb4c28a254fd7a4aeec976c46a7fa404eac4d7c134b30c75144846d7cb8f" dependencies = [ - "regex", + "base64 0.13.1", + "chunked_transfer", + "log", + "native-tls", + "once_cell", + "url", ] [[package]] name = "url" -version = "2.2.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" dependencies = [ "form_urlencoded", "idna", - "matches", "percent-encoding", "serde", ] [[package]] name = "urlencoding" -version = "1.3.3" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a1f0175e03a0973cf4afd476bef05c26e228520400eb1fd473ad417b1c00ffb" +checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "0.8.2" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" dependencies = [ "getrandom", "serde", + "sha1_smol", ] +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "vcpkg" version = "0.2.8" @@ -5336,9 +9476,35 @@ checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" [[package]] name = "version_check" -version = "0.9.2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vsimd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" + +[[package]] +name = "vte" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" +dependencies = [ + "utf8parse", + "vte_generate_state_changes", +] + +[[package]] +name = "vte_generate_state_changes" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" +dependencies = [ + "proc-macro2", + "quote", +] [[package]] name = "wait-timeout" @@ -5349,20 +9515,6 @@ dependencies = [ "libc", ] -[[package]] -name = "walkabout" -version = "0.0.0" -dependencies = [ - "anyhow", - "datadriven", - "fstrings", - "itertools", - "ore", - "quote", - "syn", - "tempfile", -] - [[package]] name = "walkdir" version = "2.3.2" @@ -5386,15 +9538,15 @@ dependencies = [ [[package]] name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" +version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.74" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5402,16 +9554,16 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.74" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", - "lazy_static", "log", + "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.39", "wasm-bindgen-shared", ] @@ -5429,9 +9581,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.74" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5439,22 +9591,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.74" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.74" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" @@ -5466,6 +9618,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web-time" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "which" version = "4.2.2" @@ -5509,14 +9671,290 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "winreg" -version = "0.7.0" +name = "windows" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winnow" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acaaa1190073b2b101e15083c38ee8ec891b5e05cbee516521e94ec008f61e64" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" dependencies = [ "winapi", ] +[[package]] +name = "workspace-hack" +version = "0.0.0" +dependencies = [ + "ahash", + "anyhow", + "async-compression", + "aws-config", + "aws-credential-types", + "aws-runtime", + "aws-sdk-sts", + "aws-sigv4", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "axum", + "bitflags 2.4.1", + "bstr 0.2.14", + "byteorder", + "bytes", + "cc", + "chrono", + "clap", + "console", + "criterion", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-utils", + "crypto-common", + "debugid", + "dec", + "digest", + "either", + "flate2", + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", + "globset", + "hashbrown 0.14.0", + "hyper", + "indexmap 1.9.1", + "itertools", + "k8s-openapi", + "kube", + "kube-client", + "kube-core", + "libc", + "libz-sys", + "log", + "memchr", + "mime_guess", + "mio", + "mysql_async", + "mysql_common", + "native-tls", + "nix", + "nom", + "num-bigint", + "num-integer", + "num-traits", + "once_cell", + "openssl", + "openssl-sys", + "ordered-float", + "parking_lot", + "phf", + "phf_shared", + "postgres", + "postgres-types", + "predicates", + "proc-macro2", + "prost", + "prost-reflect", + "prost-types", + "quote", + "rand", + "rand_chacha", + "rdkafka-sys", + "regex", + "regex-syntax", + "reqwest", + "ring", + "schemars", + "scopeguard", + "security-framework", + "semver", + "serde", + "serde_json", + "sha2", + "similar", + "smallvec", + "socket2 0.5.3", + "subtle", + "syn 1.0.107", + "syn 2.0.39", + "textwrap", + "tikv-jemalloc-sys", + "time", + "time-macros", + "timely", + "timely_communication", + "tokio", + "tokio-postgres", + "tokio-stream", + "tokio-util", + "toml_datetime", + "toml_edit", + "tower", + "tower-http", + "tracing", + "tracing-core", + "tracing-subscriber", + "tungstenite", + "uncased", + "url", + "uuid", + "zeroize", + "zstd-sys", +] + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + [[package]] name = "xattr" version = "0.2.2" @@ -5528,34 +9966,77 @@ dependencies = [ [[package]] name = "xmlparser" -version = "0.13.3" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "114ba2b24d2167ef6d67d7d04c8cc86522b87f490025f39f0303b7db5bf5e3d8" +checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" + +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zeroize" -version = "1.4.2" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf68b08513768deaa790264a7fac27a58cbf2705cfcdc9448362229217d7e970" +checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" +dependencies = [ + "serde", +] [[package]] -name = "zip" -version = "0.5.13" +name = "zstd" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" +checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" dependencies = [ - "byteorder", - "crc32fast", - "flate2", - "thiserror", + "zstd-safe 6.0.6", +] + +[[package]] +name = "zstd" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" +dependencies = [ + "zstd-safe 7.0.0", +] + +[[package]] +name = "zstd-safe" +version = "6.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" +dependencies = [ + "libc", + "zstd-sys", +] + +[[package]] +name = "zstd-safe" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" +dependencies = [ + "zstd-sys", ] [[package]] name = "zstd-sys" -version = "1.6.1+zstd.1.5.0" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615120c7a2431d16cf1cf979e7fc31ba7a5b5e5707b29c8a99e5dbf8a8392a33" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", - "libc", + "pkg-config", ] diff --git a/pkgs/servers/sql/materialize/default.nix b/pkgs/servers/sql/materialize/default.nix index 5c39af8c1ce5..90297cfa81ae 100644 --- a/pkgs/servers/sql/materialize/default.nix +++ b/pkgs/servers/sql/materialize/default.nix @@ -10,7 +10,11 @@ , libiconv , openssl , perl -, pkg-config}: +, pkg-config +, protobuf +, libclang +, rdkafka +}: let fetchNpmPackage = {name, version, hash, js_prod_file, js_dev_file, ...} @ args: @@ -20,16 +24,19 @@ let inherit hash; }; - static = "./src/materialized/src/http/static"; - cssVendor = "./src/materialized/src/http/static/css/vendor"; - jsProdVendor = "./src/materialized/src/http/static/js/vendor"; - jsDevVendor = "./src/materialized/src/http/static-dev/js/vendor"; - files = with args; [ - { src = js_prod_file; dst = "${jsProdVendor}/${name}.js"; } - { src = js_dev_file; dst = "${jsDevVendor}/${name}.js"; } - ] ++ lib.optional (args ? css_file) { src = css_file; dst = "${cssVendor}/${name}.css"; } - ++ lib.optional (args ? extra_file) { src = extra_file.src; dst = "${static}/${extra_file.dst}"; }; + { src = js_prod_file; dst = "./src/environmentd/src/http/static/js/vendor/${name}.js"; } + { src = js_prod_file; dst = "./src/prof-http/src/http/static/js/vendor/${name}.js"; } + { src = js_dev_file; dst = "./src/environmentd/src/http/static-dev/js/vendor/${name}.js"; } + { src = js_dev_file; dst = "./src/prof-http/src/http/static-dev/js/vendor/${name}.js"; } + ] ++ lib.optionals (args ? css_file) [ + { src = css_file; dst = "./src/environmentd/src/http/static/css/vendor/${name}.css"; } + { src = css_file; dst = "./src/prof-http/src/http/static/css/vendor/${name}.css"; } + ] + ++ lib.optionals (args ? extra_file) [ + { src = extra_file.src; dst = "./src/environmentd/src/http/static/${extra_file.dst}";} + { src = extra_file.src; dst = "./src/prof-http/src/http/static/${extra_file.dst}";} + ]; in lib.concatStringsSep "\n" (lib.forEach files ({src, dst}: '' mkdir -p "${dirOf dst}" @@ -40,44 +47,73 @@ let in rustPlatform.buildRustPackage rec { pname = "materialize"; - version = "0.17.0"; + version = "0.84.2"; MZ_DEV_BUILD_SHA = "9f8cf75b461d288335cb6a7a73aaa670bab4a466"; src = fetchFromGitHub { owner = "MaterializeInc"; repo = pname; rev = "v${version}"; - hash = "sha256-wKYU5S77VoOX7UA9/d21Puz9NYs/om08eNM69/m3Orc="; + hash = "sha256-+cvTCiTbuaPYPIyDxQlMWdJA5/6cbMoiTcSmjj5KPjs="; + fetchSubmodules = true; }; + postPatch = '' + ${lib.concatStringsSep "\n" (map fetchNpmPackage npmPackages)} + substituteInPlace ./misc/dist/materialized.service \ + --replace /usr/bin $out/bin \ + --replace _Materialize root + substituteInPlace ./src/catalog/build.rs \ + --replace '&[ ' '&["."' + ''; + + # needed for internal protobuf c wrapper library + env.PROTOC = "${protobuf}/bin/protoc"; + env.PROTOC_INCLUDE = "${protobuf}/include"; + env.LIBCLANG_PATH = "${libclang.lib}/lib"; + # needed to dynamically link rdkafka + env.CARGO_FEATURE_DYNAMIC_LINKING=1; + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "criterion-0.3.5" = "sha256-gXhwLw99kC08zxHdY6l5LF5EVzAAFasI4GLnopLwhEU="; - "differential-dataflow-0.12.0" = "sha256-sDy4502XqCuXqRtwLWuaHSgfX7v9NNochhfpI6n8DrM="; - "headers-0.3.5" = "sha256-ipxMfuPgoeH2uR4Im/XBdnxT00+LGzTgW7Ed2armYOU="; - "mzcloud-1.0.0" = "sha256-Nt9YCG+DFCCOMbKaNhOD78WF/z3qB5ymUIp6Wep2A9A="; - "parquet-format-async-temp-0.2.0" = "sha256-UUQv/90egmwQK0CZCztinEskvWcZ40rKWbJoWYz2oLQ="; - "postgres-0.19.1" = "sha256-zH7PF4p7wJCSYpuydTL3HPcOjPU9SlTy6IJREOe2l7U="; - "postgres_array-0.11.0" = "sha256-M1nMsQfxK0ay4JxoPqm2cl4Cp8mVZlVUAfWDhhv9nA4="; - "prometheus-0.10.0" = "sha256-NTnKt1RGiZ8AxsU8UzhLhpfEi24Pos5kR9g22Mmt444="; - "protobuf-3.0.0-alpha.2" = "sha256-8gBGQqAtKJelcBCxnDESanlblBLQ1Th7khHxUkDw7To="; - "pubnub-core-0.1.0" = "sha256-YuGEFaStfrhb0ygjVFm2a2eJla9ABc5ifXKuvJxUvgk="; - "rdkafka-0.28.0" = "sha256-u2gBTzu+IvXTDvcZGzPaVpSVOgAKhTth7GLwob4urDs="; - "timely-0.12.0" = "sha256-PHaDRNm7MezXJWhILWJHTeiCWO3iLUp94Z0V2dreCMk="; + "columnation-0.1.0" = "sha256-VRDQqIVLayEnMHeth4cjsS/FYah3B3mwYEGnv8jpKs8="; + "differential-dataflow-0.12.0" = "sha256-cEmtDXOZSy4rDFZ7gCd7lx6wH+m1S9vphjb+wO4MSAM="; + "eventsource-client-0.11.0" = "sha256-FeEWV2yy1et5mna0TyAnakXlcIR42Aq97Lfjjlom8T0="; + "launchdarkly-server-sdk-1.0.0" = "sha256-fSWiV9mNf5WBkWDNckiUR3URQ8lJ4GZURxbYO/753sU="; + "librocksdb-sys-0.11.0+8.3.2" = "sha256-bnAvH2z9n26MYFhTN/+Yz+7lEdNKKmHJOoHkxTdZGvw="; + "openssh-0.9.9" = "sha256-2jaQN6PhavUtlWwqCn2VXEg213uj7BQ+FIrhnL3rb8Q="; + "postgres-0.19.5" = "sha256-i0mURHTCMrgaW1DD1CihWMdZ3zoNI14dCpq/ja8RW9E="; + "postgres_array-0.11.0" = "sha256-ealgPVExRIFUt0QVao8H7Q7u/PTuCbpGrk6Tm5jVwZ0="; + "proptest-1.0.0" = "sha256-sJbPQIVeHZZiRXssRpJWRbD9l8QnfwVcpGu6knjAe5o="; + "rdkafka-0.29.0" = "sha256-48CMvJ4PoVfKyiNMSpCGBtj36j2CF1E8a/QQ/urfiPc="; + "reqwest-middleware-0.2.3" = "sha256-zzlQycH5dmgM8ew1gy8m5r6Q2ib7LXnUeX69M3ih+sY="; + "serde-value-0.7.0" = "sha256-ewEYsf1+9MmLuSm5KbO326ngGB79i00lAp2NMHuuxw8="; + "timely-0.12.0" = "sha256-wJtHJ9ygPVusN5Io8SjZGo1r7lcrrcauESSC+9038AU="; + "tonic-build-0.9.2" = "sha256-cGvHjgmdr3NU1phwUfMvEE6uU12fOlhTlL2LoWeOO4I="; + "tracing-opentelemetry-0.22.0" = "sha256-mawDGrue/e3dPYVG0ANs9nZ+xmQyd1YTWH8QmE6VD0U="; }; }; - nativeBuildInputs = [ cmake perl pkg-config ] + nativeBuildInputs = [ + cmake + perl + pkg-config + rustPlatform.bindgenHook + ] # Provides the mig command used by the krb5-src build script ++ lib.optional stdenv.isDarwin bootstrap_cmds; # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; - buildInputs = [ openssl ] + buildInputs = [ openssl rdkafka libclang ] ++ lib.optionals stdenv.isDarwin [ libiconv DiskArbitration Foundation ]; + # the check phase requires linking with rocksdb which can be a problem since + # the rust rocksdb crate is not updated very often. + doCheck = false; + # Skip tests that use the network checkFlags = [ "--exact" @@ -90,14 +126,7 @@ rustPlatform.buildRustPackage rec { "--skip test_tls" ]; - postPatch = '' - ${lib.concatStringsSep "\n" (map fetchNpmPackage npmPackages)} - substituteInPlace ./misc/dist/materialized.service \ - --replace /usr/bin $out/bin \ - --replace _Materialize root - ''; - - cargoBuildFlags = [ "--bin materialized" ]; + cargoBuildFlags = [ "--bin environmentd --bin clusterd" ]; postInstall = '' install --mode=444 -D ./misc/dist/materialized.service $out/etc/systemd/system/materialized.service diff --git a/pkgs/servers/sql/materialize/npm_deps.nix b/pkgs/servers/sql/materialize/npm_deps.nix index a0fccb971c02..d7b500e202ea 100644 --- a/pkgs/servers/sql/materialize/npm_deps.nix +++ b/pkgs/servers/sql/materialize/npm_deps.nix @@ -3,7 +3,7 @@ # files. # # The list of modules can be found in this file -# https://github.com/MaterializeInc/materialize/blob/master/src/materialized/build/npm.rs +# https://github.com/MaterializeInc/materialize/blob/master/src/npm/lib.rs [ { name = "@hpcc-js/wasm"; @@ -17,9 +17,9 @@ }; } { - name = "babel-standalone"; - version = "6.26.0"; - hash = "sha256-zdeTj4aOEzWvrnh90T80jL+RD8qg8PaeG0Ceua82Dz4="; + name = "@babel/standalone"; + version = "7.23.3"; + hash = "sha256-yxhB4OVOdV8hYNPqcap+5/JXYeaVrNGOSOG8lKpiG9E="; js_prod_file = "babel.min.js"; js_dev_file = "babel.js"; } From b65f34650bfdbe5b0fdbb74f5a9f80dfbad0b4e3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 25 Jan 2024 06:33:33 +0100 Subject: [PATCH 05/40] fritzing: 1.0.1 -> 1.0.2 --- .../science/electronics/fritzing/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index 46307a133de3..efe70f125d04 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , wrapQtAppsHook , qmake , pkg-config @@ -15,6 +14,7 @@ , libngspice , libgit2 , quazip +, clipper }: let @@ -38,25 +38,17 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "fritzing"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { - owner = pname; + owner = "fritzing"; repo = "fritzing-app"; - rev = "8f5f1373835050ce014299c78d91c24beea9b633"; - hash = "sha256-jLVNzSh2KwXpi3begtp/53sdBmQQbCnKMCm2p770etg="; + rev = "dbdbe34c843677df721c7b3fc3e32c0f737e7e95"; + hash = "sha256-Xi5sPU2RGkqh7T+EOvwxJJKKYDhJfccyEZ8LBBTb2s4="; }; - patches = [ - # Fix error caused by implicit call - (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0003-ParseResult-operator-bool-in-explicit.patch?h=fritzing&id=b2c79b55f0a2811e80bb1136b1e021fbc56937c9"; - hash = "sha256-9HdcNqLHEB0HQbF7AaTdUIJUbafwsRKPA+wfF4g8veU="; - }) - ]; - nativeBuildInputs = [ qmake pkg-config qttools wrapQtAppsHook ]; buildInputs = [ qtbase @@ -68,6 +60,7 @@ stdenv.mkDerivation rec { libgit2 quazip libngspice + clipper ]; postPatch = '' @@ -81,13 +74,17 @@ stdenv.mkDerivation rec { substituteInPlace src/fapplication.cpp \ --replace 'PartsChecker::getSha(dir.absolutePath());' '"${partsSha}";' + substituteInPlace phoenix.pro \ + --replace "6.5.10" "${qtbase.version}" + mkdir parts cp -a ${parts}/* parts/ ''; env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [ - "-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}/quazip" + "-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}" "-I${svgpp}/include" + "-I${clipper}/include/polyclipping" ]; env.NIX_LDFLAGS = "-lquazip1-qt${lib.versions.major qtbase.version}"; From d35003e302497f6ca002693379559a10159b9547 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 7 Jan 2024 15:29:36 +0100 Subject: [PATCH 06/40] python311Packages.recursive-pth-loader: rename from recursivePthLoader --- nixos/modules/services/web-servers/zope2.nix | 2 +- pkgs/by-name/bl/bluez/package.nix | 2 +- pkgs/development/interpreters/python/python-packages-base.nix | 4 ---- pkgs/tools/typesetting/asciidoc/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 ++ 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix index a17fe6bc2082..29731b29eea4 100644 --- a/nixos/modules/services/web-servers/zope2.nix +++ b/nixos/modules/services/web-servers/zope2.nix @@ -147,7 +147,7 @@ in name = "zope2-${name}-env"; paths = [ pkgs.python27 - pkgs.python27Packages.recursivePthLoader + pkgs.python27Packages.recursive-pth-loader pkgs.python27Packages."plone.recipe.zope2instance" ] ++ attrValues pkgs.python27.modules ++ opts.packages; diff --git a/pkgs/by-name/bl/bluez/package.nix b/pkgs/by-name/bl/bluez/package.nix index e8b649db3939..4704ecd07896 100644 --- a/pkgs/by-name/bl/bluez/package.nix +++ b/pkgs/by-name/bl/bluez/package.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { pythonPath = with python3.pkgs; [ dbus-python pygobject3 - recursivePthLoader + recursive-pth-loader ]; in '' diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index 2126b796ca9d..e2bd6cd5a5ab 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -98,8 +98,4 @@ in { python = toPythonModule python; # Dont take pythonPackages from "global" pkgs scope to avoid mixing python versions pythonPackages = self; - - # Remove? - recursivePthLoader = toPythonModule (callPackage ../../../development/python-modules/recursive-pth-loader { }); - } diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 66afb6302593..69b0ccff68bd 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -33,7 +33,7 @@ , enableDiagFilter ? false, blockdiag, seqdiag, actdiag, nwdiag , enableQrcodeFilter ? false, qrencode , enableMatplotlibFilter ? false, matplotlib, numpy -, enableAafigureFilter ? false, aafigure, recursivePthLoader +, enableAafigureFilter ? false, aafigure, recursive-pth-loader # backends , enableDeckjsBackend ? false , enableOdfBackend ? false @@ -180,7 +180,7 @@ in python3.pkgs.buildPythonApplication rec { echo "Extracting aafigure filter" unzip -d "$out/etc/asciidoc/filters/aafigure" "${aafigureFilterSrc}" # Add aafigure to sys.path (and it needs recursive-pth-loader) - pth_loader_path="$(toPythonPath ${recursivePthLoader})" + pth_loader_path="$(toPythonPath ${recursive-pth-loader})" aafigure_path="$(toPythonPath ${aafigure})" sed -i "/^import.*sys/asys.path.append(\"$pth_loader_path\"); sys.path.append(\"$aafigure_path\"); import sitecustomize" \ "$out/etc/asciidoc/filters/aafigure/aafig2img.py" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c088ca1ead3..d3ac480bece8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6583,7 +6583,7 @@ with pkgs; arpoison = callPackage ../tools/networking/arpoison { }; asciidoc = callPackage ../tools/typesetting/asciidoc { - inherit (python3.pkgs) pygments matplotlib numpy aafigure recursivePthLoader; + inherit (python3.pkgs) pygments matplotlib numpy aafigure recursive-pth-loader; w3m = w3m-batch; enableStandardFeatures = false; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index ad98e21d5ef5..9a3b4f5c10ac 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -425,6 +425,7 @@ mapAliases ({ rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 readme_renderer = readme-renderer; # added 2024-01-07 recaptcha_client = throw "recaptcha_client has been removed since it is no longer maintained"; # added 2023-10-20 + recursivePthLoader = recursive-pth-loader; # added 2024-01-07 rednose = throw "rednose is no longer maintained (since February 2018)"; # added 2023-08-06 repeated_test = repeated-test; # added 2022-11-15 repoze_lru = repoze-lru; # added 2023-11-11 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ba9705c80c1f..8b2393967edc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12480,6 +12480,8 @@ self: super: with self; { recurring-ical-events = callPackage ../development/python-modules/recurring-ical-events { }; + recursive-pth-loader = toPythonModule (callPackage ../development/python-modules/recursive-pth-loader { }); + redbaron = callPackage ../development/python-modules/redbaron { }; redis = callPackage ../development/python-modules/redis { }; From c5acc7a3a9f81d7ac64b6a692d204e4e5056bef9 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Fri, 26 Jan 2024 17:56:20 +0100 Subject: [PATCH 07/40] simple-dftd3: add python bindings --- .../science/chemistry/simple-dftd3/python.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/libraries/science/chemistry/simple-dftd3/python.nix diff --git a/pkgs/development/libraries/science/chemistry/simple-dftd3/python.nix b/pkgs/development/libraries/science/chemistry/simple-dftd3/python.nix new file mode 100644 index 000000000000..74f24e10f55f --- /dev/null +++ b/pkgs/development/libraries/science/chemistry/simple-dftd3/python.nix @@ -0,0 +1,42 @@ +{ buildPythonPackage +, pkg-config +, meson +, simple-dftd3 +, cffi +, numpy +, toml +, qcengine +, pyscf +, ase +, pytestCheckHook +}: + +buildPythonPackage { + inherit (simple-dftd3) pname version src meta; + + # pytest is also required for installation, not only testing + nativeBuildInputs = [ pytestCheckHook ]; + + buildInputs = [ simple-dftd3 ]; + + propagatedBuildInputs = [ + cffi + numpy + toml + ]; + + checkInputs = [ + ase + qcengine + pyscf + ]; + + preConfigure = '' + cd python + ''; + + # The compiled CFFI is not placed correctly before pytest invocation + preCheck = '' + find . -name "_libdftd3*" -exec cp {} ./dftd3/. \; + ''; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e48f85ef1392..9cd835cc2f63 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13272,6 +13272,10 @@ self: super: with self; { simplesat = callPackage ../development/python-modules/simplesat { }; + simple-dftd3 = callPackage ../development/libraries/science/chemistry/simple-dftd3/python.nix { + inherit (pkgs) simple-dftd3; + }; + simple-di = callPackage ../development/python-modules/simple-di { }; simple-rest-client = callPackage ../development/python-modules/simple-rest-client { }; From 2f8b1487b44691516bb079297796f26e2ea60574 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jan 2024 22:14:45 +0000 Subject: [PATCH 08/40] rmg: 0.5.5 -> 0.5.6 --- pkgs/by-name/rm/rmg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rm/rmg/package.nix b/pkgs/by-name/rm/rmg/package.nix index 09a774b1f482..da1120e9b9f0 100644 --- a/pkgs/by-name/rm/rmg/package.nix +++ b/pkgs/by-name/rm/rmg/package.nix @@ -26,13 +26,13 @@ let in stdenv.mkDerivation rec { pname = "rmg"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "Rosalie241"; repo = "RMG"; rev = "v${version}"; - hash = "sha256-au5GDyfW9+drkDNBWNbPY5Bgbow/hQmvP5pWJsYKbYs="; + hash = "sha256-2MrqHSz76gPqU7ajccHUhbyf4lYuDraxdMnifbtQ0o8="; }; nativeBuildInputs = [ From 3ea831439603fbd999aebf4cba597c004b06883d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 27 Jan 2024 04:20:00 +0000 Subject: [PATCH 09/40] python311Packages.jupyter-book: 0.15.1 -> 1.0.0 Changelog: https://github.com/executablebooks/jupyter-book/blob/v1.0.0/CHANGELOG.md --- .../python-modules/jupyter-book/default.nix | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix index 69d0734bfa00..bdb7b5772941 100644 --- a/pkgs/development/python-modules/jupyter-book/default.nix +++ b/pkgs/development/python-modules/jupyter-book/default.nix @@ -3,13 +3,12 @@ , fetchPypi , pythonOlder , flit-core -, pythonRelaxDepsHook , click -, docutils , jinja2 , jsonschema , linkify-it-py , myst-nb +, myst-parser , pyyaml , sphinx , sphinx-comments @@ -26,29 +25,28 @@ buildPythonPackage rec { pname = "jupyter-book"; - version = "0.15.1"; + version = "1.0.0"; + pyproject = true; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - hash = "sha256-ihY07Bb37t7g0Rbx5ft8SCAyia2S2kLglRnccdlWwBA="; + inherit version; + pname = "jupyter_book"; + hash = "sha256-U5xdBJNUYgDZ3ie9S1936uoDEV+JN/gl1P+Cs4AamH4="; }; nativeBuildInputs = [ flit-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ click - docutils jinja2 jsonschema linkify-it-py myst-nb + myst-parser pyyaml sphinx sphinx-comments @@ -63,16 +61,9 @@ buildPythonPackage rec { sphinx-multitoc-numbering ]; - pythonRelaxDeps = [ - "docutils" - "myst-nb" - "sphinx" - "sphinx-thebe" - "sphinxcontrib-bibtex" - ]; - pythonImportsCheck = [ "jupyter_book" + "jupyter_book.cli.main" ]; meta = with lib; { @@ -81,5 +72,6 @@ buildPythonPackage rec { changelog = "https://github.com/executablebooks/jupyter-book/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ marsam ]; + mainProgram = "jupyter-book"; }; } From b87f47a25c1cb3ed75da88837a6267ce4e2ba4d0 Mon Sep 17 00:00:00 2001 From: Max Ambaum Date: Sat, 27 Jan 2024 16:03:16 +0000 Subject: [PATCH 10/40] ianny: init at v1.0.0beta.1 --- pkgs/by-name/ia/ianny/package.nix | 43 +++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/ia/ianny/package.nix diff --git a/pkgs/by-name/ia/ianny/package.nix b/pkgs/by-name/ia/ianny/package.nix new file mode 100644 index 000000000000..6b7c3ca940e5 --- /dev/null +++ b/pkgs/by-name/ia/ianny/package.nix @@ -0,0 +1,43 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, dbus +, pkg-config +}: + +rustPlatform.buildRustPackage rec { + pname = "ianny"; + version = "1.0.0beta.1"; + + src = fetchFromGitHub { + owner = "zefr0x"; + repo = "ianny"; + rev = "v${version}"; + hash = "sha256-Bnr+wtusvTM690IISBs0wKj0ChBoIrMHyVZ8wdGgK08="; + }; + + cargoHash = "sha256-/8C+hDq/z+h1uxO9prLbKHgyfMGrMODAs5/yUrutaAM="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dbus.dev ]; + + postPatch = '' + substituteInPlace src/main.rs \ + --replace-fail '/usr/share/locale' $out/share/locale + ''; + + preFixup = '' + mkdir -p $out/etc/xdg/autostart + mkdir -p $out/usr/share/local + cp io.github.zefr0x.ianny.desktop $out/etc/xdg/autostart/ + ''; + + meta = with lib; { + description = "Desktop utility that helps preventing repetitive strain injuries by keeping track of usage patterns and periodically informing the user to take breaks."; + homepage = "https://github.com/zefr0x/ianny"; + license = licenses.gpl3; + mainProgram = "ianny"; + maintainers = with maintainers; [ max-amb ]; + platforms = platforms.linux; + }; +} From 019c26e90b469dca4c1f44067edecc24df41ddd5 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Sun, 28 Jan 2024 02:52:18 +1000 Subject: [PATCH 11/40] supersonic: 0.8.2 -> 0.9.0 --- pkgs/by-name/su/supersonic/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index 20d126a92a26..9feb440c8087 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -20,16 +20,16 @@ assert waylandSupport -> stdenv.isLinux; buildGoModule rec { pname = "supersonic" + lib.optionalString waylandSupport "-wayland"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "dweymouth"; repo = "supersonic"; rev = "v${version}"; - hash = "sha256-hhFnOxWXR91WpB51c4fvIENoAtqPj+VmPImGcXwTH0o="; + hash = "sha256-QHDTbcWSEFleMsjt4BR4xt6DlqPSowUbHmi4+83c0kc="; }; - vendorHash = "sha256-oAp3paXWXtTB+1UU/KGewCDQWye16rxNnNWQMdrhgP0="; + vendorHash = "sha256-ANVkQpCnPsRueHyxRJMY5cqMZ5Q/QMVW4KS+TFYMpUQ="; nativeBuildInputs = [ copyDesktopItems From eda0e2250e0a3672a199fe7a05481180c9ce44d5 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 20 Jan 2024 20:35:51 +0400 Subject: [PATCH 12/40] c-periphery: init at 2.4.2 --- pkgs/by-name/c-/c-periphery/package.nix | 35 +++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/c-/c-periphery/package.nix diff --git a/pkgs/by-name/c-/c-periphery/package.nix b/pkgs/by-name/c-/c-periphery/package.nix new file mode 100644 index 000000000000..7e033a1a3327 --- /dev/null +++ b/pkgs/by-name/c-/c-periphery/package.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "c-periphery"; + version = "2.4.2"; + + src = fetchFromGitHub { + owner = "vsergeev"; + repo = "c-periphery"; + rev = "v${finalAttrs.version}"; + hash = "sha256-uUSXvMQcntUqD412UWkMif0wLxPhpPdnMb96Pqqh/B4="; + }; + + outputs = [ "dev" "lib" "out" ]; + + postPatch = '' + substituteInPlace src/libperiphery.pc.in \ + --replace '=''${prefix}/' '=' \ + --replace '=''${exec_prefix}/' '=' + ''; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "A C library for peripheral I/O (GPIO, LED, PWM, SPI, I2C, MMIO, Serial) in Linux"; + homepage = "https://github.com/vsergeev/c-periphery"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.linux; + }; +}) From 1deaf13cb8bd673ca9d5b61fe0f1b618051a5e73 Mon Sep 17 00:00:00 2001 From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Sat, 27 Jan 2024 18:44:43 +0000 Subject: [PATCH 13/40] haskellPackages.llvm-hs: unpin llvm_9 according https://hydra.nixos.org/build/233205149 the first broken build of llvm-hs was in 2022-02-18 09:30:43. unpin llvm_9 so LLVM9 can be removed from nixpkgs --- pkgs/development/haskell-modules/configuration-nix.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 6e63cca2c154..cc5262f81f53 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -492,9 +492,6 @@ self: super: builtins.intersectAttrs super { # Uses OpenGL in testing caramia = dontCheck super.caramia; - # requires llvm 9 specifically https://github.com/llvm-hs/llvm-hs/#building-from-source - llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm_9; }; - # llvm-ffi needs a specific version of LLVM which we hard code here. Since we # can't use pkg-config (LLVM has no official .pc files), we need to pass the # `dev` and `lib` output in, or Cabal will have trouble finding the library. From b80c3284d5d2a7282272e764e3c48bccccdbadcb Mon Sep 17 00:00:00 2001 From: Tamara Schmitz Date: Wed, 20 Dec 2023 01:38:07 +0100 Subject: [PATCH 14/40] nixos/hardened: update hardened profile to new recommendations Borrowing from here to match hardened profile with more recent kernels: * https://madaidans-insecurities.github.io/guides/linux-hardening.html?#boot-parameters * https://github.com/a13xp0p0v/kernel-hardening-checker/ Removed "slub_debug" as that option disables kernel memory address hashing. You also see a big warning about this in the dmesg: "This system shows unhashed kernel memory addresses via the console, logs, and other interfaces." "init_on_alloc=1" and "init_on_free=1" zeroes all SLAB and SLUB allocations. Introduced in 6471384af2a6530696fc0203bafe4de41a23c9ef. Also the default for the Android Google kernel btw. It is on by default through the KConfig. "slab_nomerge" prevents the merging of slab/slub caches. These are effectively slab/slub pools. "LEGACY_VSYSCALL_NONE" disables the older vsyscall mechanic that relies on static address. It got superseeded by vdsos a decade ago. Read some LWN.net to learn more ;) "debugfs=off" I'm sure there are some few userspace programs that rely on debugfs, but they shouldn't. Most other things mentioned on the blog where already the default on a running machine or may not be applicable. Most other Kconfigs changes come from the kernel hardening checker and were added, when they were not applied to the kernel already. Unsure about CONFIG_STATIC_USERMODEHELPER. Would need testing. --- nixos/modules/profiles/hardened.nix | 9 +++-- .../linux/kernel/hardened/config.nix | 39 +++++++++++++++++-- 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 74dc2cb1b9aa..b85a2ac7e69d 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -39,14 +39,17 @@ with lib; security.apparmor.killUnconfinedConfinables = mkDefault true; boot.kernelParams = [ - # Slab/slub sanity checks, redzoning, and poisoning - "slub_debug=FZP" + # Don't merge slabs + "slab_nomerge" - # Overwrite free'd memory + # Overwrite free'd pages "page_poison=1" # Enable page allocator randomization "page_alloc.shuffle=1" + + # Disable debugfs + "debugfs=off" ]; boot.blacklistedKernelModules = [ diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix index 7aa9c5117352..ea49966f46dd 100644 --- a/pkgs/os-specific/linux/kernel/hardened/config.nix +++ b/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -39,21 +39,33 @@ assert (versionAtLeast version "4.9"); DEBUG_PI_LIST = whenOlder "5.2" yes; # doesn't BUG() DEBUG_PLIST = whenAtLeast "5.2" yes; DEBUG_SG = yes; + DEBUG_VIRTUAL = yes; SCHED_STACK_END_CHECK = yes; REFCOUNT_FULL = whenOlder "5.4.208" yes; + # tell EFI to wipe memory during reset + # https://lwn.net/Articles/730006/ + RESET_ATTACK_MITIGATION = yes; + + # restricts loading of line disciplines via TIOCSETD ioctl to CAP_SYS_MODULE + CONFIG_LDISC_AUTOLOAD = option no; + # Randomize page allocator when page_alloc.shuffle=1 SHUFFLE_PAGE_ALLOCATOR = whenAtLeast "5.2" yes; - # Allow enabling slub/slab free poisoning with slub_debug=P - SLUB_DEBUG = yes; - # Wipe higher-level memory allocations on free() with page_poison=1 PAGE_POISONING = yes; PAGE_POISONING_NO_SANITY = whenOlder "5.11" yes; PAGE_POISONING_ZERO = whenOlder "5.11" yes; + # Enable init_on_alloc and init_on_free by default + INIT_ON_ALLOC_DEFAULT_ON = yes; + INIT_ON_FREE_DEFAULT_ON = yes; + + # Wipe all caller-used registers on exit from a function + ZERO_CALL_USED_REGS = yes; + # Enable the SafeSetId LSM SECURITY_SAFESETID = whenAtLeast "5.1" yes; @@ -70,6 +82,16 @@ assert (versionAtLeast version "4.9"); GCC_PLUGIN_RANDSTRUCT = whenOlder "5.19" yes; # A port of the PaX randstruct plugin GCC_PLUGIN_RANDSTRUCT_PERFORMANCE = whenOlder "5.19" yes; + # Runtime undefined behaviour checks + # https://www.kernel.org/doc/html/latest/dev-tools/ubsan.html + # https://developers.redhat.com/blog/2014/10/16/gcc-undefined-behavior-sanitizer-ubsan + UBSAN = yes; + UBSAN_TRAP = yes; + UBSAN_BOUNDS = yes; + UBSAN_SANITIZE_ALL = yes; + UBSAN_LOCAL_BOUNDS = option yes; # clang only + CFI_CLANG = option yes; # clang only Control Flow Integrity since 6.1 + # Same as GCC_PLUGIN_RANDSTRUCT*, but has been renamed to `RANDSTRUCT*` in 5.19. RANDSTRUCT = whenAtLeast "5.19" yes; RANDSTRUCT_PERFORMANCE = whenAtLeast "5.19" yes; @@ -97,4 +119,15 @@ assert (versionAtLeast version "4.9"); # CONFIG_DEVMEM=n causes these to not exist anymore. STRICT_DEVMEM = option no; IO_STRICT_DEVMEM = option no; + + # stricter IOMMU TLB invalidation + IOMMU_DEFAULT_DMA_STRICT = option yes; + IOMMU_DEFAULT_DMA_LAZY = option no; + + # not needed for less than a decade old glibc versions + LEGACY_VSYSCALL_NONE = yes; + + # Straight-Line-Speculation + # https://lwn.net/Articles/877845/ + SLS = option yes; } From 6a570f840bdd6619106a31c4f7f244d7e588b9a4 Mon Sep 17 00:00:00 2001 From: Lan Tian Date: Sun, 10 Sep 2023 10:07:59 -0700 Subject: [PATCH 15/40] maintainers: add xddxdd --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ec233f502675..e8c5d303c397 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -20430,6 +20430,16 @@ githubId = 13489144; name = "Calle Rosenquist"; }; + xddxdd = { + email = "b980120@hotmail.com"; + github = "xddxdd"; + githubId = 5778879; + keys = [ + { fingerprint = "2306 7C13 B6AE BDD7 C0BB 5673 27F3 1700 E751 EC22"; } + { fingerprint = "B195 E8FB 873E 6020 DCD1 C0C6 B50E C319 385F CB0D"; } + ]; + name = "Yuhui Xu"; + }; xdhampus = { name = "Hampus"; github = "xdHampus"; From 8d355e4b66167c39e0e124a857e5e9e956f64d2d Mon Sep 17 00:00:00 2001 From: Lan Tian Date: Sat, 27 Jan 2024 13:52:25 -0800 Subject: [PATCH 16/40] svp: init at 4.5.210-2 --- pkgs/by-name/sv/svp/mpv.nix | 24 ++++++ pkgs/by-name/sv/svp/package.nix | 147 ++++++++++++++++++++++++++++++++ 2 files changed, 171 insertions(+) create mode 100644 pkgs/by-name/sv/svp/mpv.nix create mode 100644 pkgs/by-name/sv/svp/package.nix diff --git a/pkgs/by-name/sv/svp/mpv.nix b/pkgs/by-name/sv/svp/mpv.nix new file mode 100644 index 000000000000..752d76baf794 --- /dev/null +++ b/pkgs/by-name/sv/svp/mpv.nix @@ -0,0 +1,24 @@ +{ lib +, mpv-unwrapped +, wrapMpv +, ocl-icd +, ... +}: +let + libraries = [ + ocl-icd + ]; +in +wrapMpv + (mpv-unwrapped.override { + vapoursynthSupport = true; + }) +{ + extraMakeWrapperArgs = [ + # Add paths to required libraries + "--prefix" + "LD_LIBRARY_PATH" + ":" + "/run/opengl-driver/lib:${lib.makeLibraryPath libraries}" + ]; +} diff --git a/pkgs/by-name/sv/svp/package.nix b/pkgs/by-name/sv/svp/package.nix new file mode 100644 index 000000000000..639c67d8cd11 --- /dev/null +++ b/pkgs/by-name/sv/svp/package.nix @@ -0,0 +1,147 @@ +{ stdenv +, buildFHSEnv +, writeShellScriptBin +, fetchurl +, callPackage +, makeDesktopItem +, copyDesktopItems +, ffmpeg +, glibc +, gnome +, jq +, lib +, libmediainfo +, libsForQt5 +, libusb1 +, ocl-icd +, p7zip +, patchelf +, socat +, vapoursynth +, xdg-utils +, xorg +}: +let + mpvForSVP = callPackage ./mpv.nix { }; + + # Script provided by GitHub user @xrun1 + # https://github.com/xddxdd/nur-packages/issues/31#issuecomment-1812591688 + fakeLsof = writeShellScriptBin "lsof" '' + for arg in "$@"; do + if [ -S "$arg" ]; then + printf %s p + echo '{"command": ["get_property", "pid"]}' | + ${socat}/bin/socat - "UNIX-CONNECT:$arg" | + ${jq}/bin/jq -Mr .data + printf '\n' + fi + done + ''; + + libraries = [ + fakeLsof + ffmpeg.bin + glibc + gnome.zenity + libmediainfo + libsForQt5.qtbase + libsForQt5.qtwayland + libsForQt5.qtdeclarative + libsForQt5.qtscript + libsForQt5.qtsvg + libusb1 + mpvForSVP + ocl-icd + stdenv.cc.cc.lib + vapoursynth + xdg-utils + xorg.libX11 + ]; + + svp-dist = stdenv.mkDerivation rec { + pname = "svp-dist"; + version = "4.5.210-2"; + src = fetchurl { + url = "https://www.svp-team.com/files/svp4-linux.${version}.tar.bz2"; + hash = "sha256-dY9uQ9jzTHiN2XSnOrXtHD11IIJW6t9BUzGGQFfZ+yg="; + }; + + nativeBuildInputs = [ p7zip patchelf ]; + dontFixup = true; + + unpackPhase = '' + tar xf ${src} + ''; + + buildPhase = '' + mkdir installer + LANG=C grep --only-matching --byte-offset --binary --text $'7z\xBC\xAF\x27\x1C' "svp4-linux-64.run" | + cut -f1 -d: | + while read ofs; do dd if="svp4-linux-64.run" bs=1M iflag=skip_bytes status=none skip=$ofs of="installer/bin-$ofs.7z"; done + ''; + + installPhase = '' + mkdir -p $out/opt + for f in "installer/"*.7z; do + 7z -bd -bb0 -y x -o"$out/opt/" "$f" || true + done + + for SIZE in 32 48 64 128; do + mkdir -p "$out/share/icons/hicolor/''${SIZE}x''${SIZE}/apps" + mv "$out/opt/svp-manager4-''${SIZE}.png" "$out/share/icons/hicolor/''${SIZE}x''${SIZE}/apps/svp-manager4.png" + done + rm -f $out/opt/{add,remove}-menuitem.sh + ''; + }; + + fhs = buildFHSEnv { + name = "SVPManager"; + targetPkgs = pkgs: libraries; + runScript = "${svp-dist}/opt/SVPManager"; + unshareUser = false; + unshareIpc = false; + unsharePid = false; + unshareNet = false; + unshareUts = false; + unshareCgroup = false; + }; +in +stdenv.mkDerivation { + pname = "svp"; + inherit (svp-dist) version; + + dontUnpack = true; + + nativeBuildInputs = [ copyDesktopItems ]; + + postInstall = '' + mkdir -p $out/bin $out/share + ln -s ${fhs}/bin/SVPManager $out/bin/SVPManager + ln -s ${svp-dist}/share/icons $out/share/icons + ''; + + passthru.mpv = mpvForSVP; + + desktopItems = [ + (makeDesktopItem { + name = "svp-manager4"; + exec = "${fhs}/bin/SVPManager %f"; + desktopName = "SVP 4 Linux"; + genericName = "Real time frame interpolation"; + icon = "svp-manager4"; + categories = [ "AudioVideo" "Player" "Video" ]; + mimeTypes = [ "video/x-msvideo" "video/x-matroska" "video/webm" "video/mpeg" "video/mp4" ]; + terminal = false; + startupNotify = true; + }) + ]; + + meta = with lib; { + description = "SmoothVideo Project 4 (SVP4) converts any video to 60 fps (and even higher) and performs this in real time right in your favorite video player."; + homepage = "https://www.svp-team.com/wiki/SVP:Linux"; + platforms = [ "x86_64-linux" ]; + license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ xddxdd ]; + }; +} From 67eac1299aa2017e6d0990151213c20990177230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 27 Jan 2024 20:26:32 -0800 Subject: [PATCH 17/40] librewolf-unwrapped: 122.0-1 -> 122.0-2 --- .../networking/browsers/librewolf/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 1c40bc81703a..357868b665fb 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,12 +1,12 @@ { - "packageVersion": "122.0-1", + "packageVersion": "122.0-2", "source": { - "rev": "122.0-1", - "sha256": "18b2pfh61cxkl7ww0fi5wjv580ca7i5sshviqym8w0w38lhp7rsv" + "rev": "122.0-2", + "sha256": "139vqa0czhbsg8naz75pcf5d8dql30slwrn4l8hkr4r1s1mslyq1" }, "settings": { - "rev": "41623492f2b6970972014f6ce196015d3d7f1b59", - "sha256": "0ayyyw44q0gh668bzlv6cfl7baa0818bnz83g53l5j2f10xd52by" + "rev": "fe568fa26d52fa917c89d735468a17b990a23e2c", + "sha256": "1gska84ib386a1021r1n54mb1a47bqn459v5n26g4wqx3xrma48n" }, "firefox": { "version": "122.0", From 2e32297bf39fa6a2a345299ad884bd1d246b8a80 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Jan 2024 04:29:36 +0000 Subject: [PATCH 18/40] nwg-displays: 0.3.12 -> 0.3.13 --- pkgs/applications/misc/nwg-displays/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/nwg-displays/default.nix b/pkgs/applications/misc/nwg-displays/default.nix index 804198d5a641..b73df6de31ee 100644 --- a/pkgs/applications/misc/nwg-displays/default.nix +++ b/pkgs/applications/misc/nwg-displays/default.nix @@ -14,13 +14,13 @@ python310Packages.buildPythonApplication rec { pname = "nwg-displays"; - version = "0.3.12"; + version = "0.3.13"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-displays"; rev = "refs/tags/v${version}"; - hash = "sha256-cr+2ejpXEOg0e86tT37o9400J299DQSkOrQUZE5+V2s="; + hash = "sha256-ZXEnlcifwJTnpSKVET/ThIA0NHLP9fQTIM2bQbJ7qZ8="; }; nativeBuildInputs = [ From d2f2058b0a593f260952ab438e91cbefb9eef2cd Mon Sep 17 00:00:00 2001 From: Karolis Stasaitis Date: Sat, 27 Jan 2024 12:24:03 +0530 Subject: [PATCH 19/40] dsview: build for darwin --- .../science/electronics/dsview/default.nix | 13 +++++++------ .../science/electronics/dsview/install.patch | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix index 98c35c37e8d5..ec53e976aec5 100644 --- a/pkgs/applications/science/electronics/dsview/default.nix +++ b/pkgs/applications/science/electronics/dsview/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, pkg-config, cmake, wrapQtAppsHook , libzip, boost, fftw, qtbase, qtwayland, qtsvg, libusb1 -, python3, fetchpatch +, python3, fetchpatch, desktopToDarwinBundle }: stdenv.mkDerivation rec { @@ -20,18 +20,19 @@ stdenv.mkDerivation rec { ./install.patch ]; - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ] + ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; buildInputs = [ - boost fftw qtbase qtwayland qtsvg libusb1 libzip + boost fftw qtbase qtsvg libusb1 libzip python3 - ]; + ] ++ lib.optional stdenv.isLinux qtwayland; meta = with lib; { description = "A GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc"; homepage = "https://www.dreamsourcelab.com/"; license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ bachp ]; + platforms = platforms.unix; + maintainers = with maintainers; [ bachp carlossless ]; }; } diff --git a/pkgs/applications/science/electronics/dsview/install.patch b/pkgs/applications/science/electronics/dsview/install.patch index 9fd9133e2795..9fc660bf8148 100644 --- a/pkgs/applications/science/electronics/dsview/install.patch +++ b/pkgs/applications/science/electronics/dsview/install.patch @@ -16,8 +16,8 @@ index eb9be42..220817c 100644 - install(FILES DSView/DreamSourceLab.rules DESTINATION /etc/udev/rules.d RENAME 60-dreamsourcelab.rules) - endif() - -+ install(FILES DSView/DSView.desktop DESTINATION share/applications RENAME dsview.desktop) + install(FILES DSView/DreamSourceLab.rules DESTINATION etc/udev/rules.d RENAME 60-dreamsourcelab.rules) endif() ++install(FILES DSView/DSView.desktop DESTINATION share/applications RENAME dsview.desktop) install(FILES NEWS25 DESTINATION share/DSView RENAME NEWS25) From 5a6535977e00c850d2649572eaa219b6f538f5a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Jan 2024 05:46:09 +0000 Subject: [PATCH 20/40] slurm: 23.11.1.1 -> 23.11.3.1 --- pkgs/servers/computing/slurm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 08fdbcebb016..d3ef5324db86 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "23.11.1.1"; + version = "23.11.3.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - hash = "sha256-dfCQKKw44bD5d7Sv7e40Qm3df9Mzz7WvmWf7SP8R1KQ="; + hash = "sha256-fSw7LaIEyExsdVgJ9pfWEBhnBUsczdJl0coEPDdKVzA="; }; outputs = [ "out" "dev" ]; From fe59b6d24ba18fe0b364c55e9e86204c9cc2488f Mon Sep 17 00:00:00 2001 From: Brendan Golden <7858375+Silver-Golden@users.noreply.github.com> Date: Sun, 28 Jan 2024 10:52:43 +0000 Subject: [PATCH 21/40] Bitwarden directory connector: fix bad preStart --- .../bitwarden-directory-connector-cli.nix | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/nixos/modules/services/security/bitwarden-directory-connector-cli.nix b/nixos/modules/services/security/bitwarden-directory-connector-cli.nix index 18c02e22fd7e..a55758322a75 100644 --- a/nixos/modules/services/security/bitwarden-directory-connector-cli.nix +++ b/nixos/modules/services/security/bitwarden-directory-connector-cli.nix @@ -277,42 +277,42 @@ in { BITWARDENCLI_CONNECTOR_PLAINTEXT_SECRETS = "true"; }; + preStart = '' + set -eo pipefail + + # create the config file + ${lib.getExe cfg.package} data-file + touch /tmp/data.json.tmp + chmod 600 /tmp/data.json{,.tmp} + + ${lib.getExe cfg.package} config server ${cfg.domain} + + # now login to set credentials + export BW_CLIENTID="$(< ${escapeShellArg cfg.secrets.bitwarden.client_path_id})" + export BW_CLIENTSECRET="$(< ${escapeShellArg cfg.secrets.bitwarden.client_path_secret})" + ${lib.getExe cfg.package} login + + jq '.authenticatedAccounts[0] as $account + | .[$account].directoryConfigurations.ldap |= $ldap_data + | .[$account].directorySettings.organizationId |= $orgID + | .[$account].directorySettings.sync |= $sync_data' \ + --argjson ldap_data ${escapeShellArg cfg.ldap.finalJSON} \ + --arg orgID "''${BW_CLIENTID//organization.}" \ + --argjson sync_data ${escapeShellArg cfg.sync.finalJSON} \ + /tmp/data.json \ + > /tmp/data.json.tmp + + mv -f /tmp/data.json.tmp /tmp/data.json + + # final config + ${lib.getExe cfg.package} config directory 0 + ${lib.getExe cfg.package} config ldap.password --secretfile ${cfg.secrets.ldap} + ''; + serviceConfig = { Type = "oneshot"; User = "${cfg.user}"; PrivateTmp = true; - preStart = '' - set -eo pipefail - - # create the config file - ${lib.getExe cfg.package} data-file - touch /tmp/data.json.tmp - chmod 600 /tmp/data.json{,.tmp} - - ${lib.getExe cfg.package} config server ${cfg.domain} - - # now login to set credentials - export BW_CLIENTID="$(< ${escapeShellArg cfg.secrets.bitwarden.client_path_id})" - export BW_CLIENTSECRET="$(< ${escapeShellArg cfg.secrets.bitwarden.client_path_secret})" - ${lib.getExe cfg.package} login - - jq '.authenticatedAccounts[0] as $account - | .[$account].directoryConfigurations.ldap |= $ldap_data - | .[$account].directorySettings.organizationId |= $orgID - | .[$account].directorySettings.sync |= $sync_data' \ - --argjson ldap_data ${escapeShellArg cfg.ldap.finalJSON} \ - --arg orgID "''${BW_CLIENTID//organization.}" \ - --argjson sync_data ${escapeShellArg cfg.sync.finalJSON} \ - /tmp/data.json \ - > /tmp/data.json.tmp - - mv -f /tmp/data.json.tmp /tmp/data.json - - # final config - ${lib.getExe cfg.package} config directory 0 - ${lib.getExe cfg.package} config ldap.password --secretfile ${cfg.secrets.ldap} - ''; - ExecStart = "${lib.getExe cfg.package} sync"; }; }; From eb301ff30582340eabb81f657034596ee4f80de9 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Sun, 28 Jan 2024 12:33:02 +0100 Subject: [PATCH 22/40] kodiPackages.netflix: 1.23.1 -> 1.23.2 https://github.com/CastagnaIT/plugin.video.netflix/releases/tag/v1.23.2 --- pkgs/applications/video/kodi/addons/netflix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/netflix/default.nix b/pkgs/applications/video/kodi/addons/netflix/default.nix index ce66665ee73b..2bff3b6d19b3 100644 --- a/pkgs/applications/video/kodi/addons/netflix/default.nix +++ b/pkgs/applications/video/kodi/addons/netflix/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "netflix"; namespace = "plugin.video.netflix"; - version = "1.23.1"; + version = "1.23.2"; src = fetchFromGitHub { owner = "CastagnaIT"; repo = namespace; rev = "v${version}"; - sha256 = "sha256-ZY59I3RR/gl24XqZiBkenHM/D4tW/5ZyE4UngtvODYQ="; + hash = "sha256-/wHKwFZbuxK0iwlqvZpyfi0lnRkjm/HSn221IgCN7VQ="; }; propagatedBuildInputs = [ From faf921b88d6604527cfbc31db7bb516dae964647 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Jan 2024 11:46:46 +0000 Subject: [PATCH 23/40] python311Packages.posthog: 3.3.2 -> 3.3.3 --- pkgs/development/python-modules/posthog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index 8606a9834a25..993427596d40 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -14,7 +14,7 @@ }: let pname = "posthog"; - version = "3.3.2"; + version = "3.3.3"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "PostHog"; repo = "posthog-python"; rev = "refs/tags/v${version}"; - hash = "sha256-7Bs0KDa799qt8sKwmj6oO0L/nWzczI+UXGWNXGv7B7s="; + hash = "sha256-60SnWjxgTZrN6H/LQg2Oj9Es6YluAyladLHqrNL2dQY="; }; propagatedBuildInputs = [ From 8a256ed0a738e4b029743b0d4c1e6362ea6600cd Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 28 Jan 2024 14:40:11 +0000 Subject: [PATCH 24/40] maintainers/scripts/bootstrap-files: documentation and a script to update tarballs This script attempts to document the exact procedure used to upload bootstrap binaries used previously. I modeled it after most recent https://github.com/NixOS/nixpkgs/pull/282517 upload. There is one deviation from it to make it easier to handle mass updates for https://github.com/NixOS/nixpkgs/issues/253713: The binaries are expected to be stored in `stdenv/$target` (and not something like `stdenv-linux/i686`. The script handles both native and cross- linux targets. `darwin` will need a bit more work to fin into this scheme, but it should be easy. Example run to generate `i686-linux` update: $ maintainers/scripts/bootstrap-files/refresh-tarballs.bash --commit --targets=i686-unknown-linux-gnu --- maintainers/scripts/bootstrap-files/README.md | 85 ++++++ .../bootstrap-files/refresh-tarballs.bash | 282 ++++++++++++++++++ 2 files changed, 367 insertions(+) create mode 100644 maintainers/scripts/bootstrap-files/README.md create mode 100755 maintainers/scripts/bootstrap-files/refresh-tarballs.bash diff --git a/maintainers/scripts/bootstrap-files/README.md b/maintainers/scripts/bootstrap-files/README.md new file mode 100644 index 000000000000..ae385cbd6ce8 --- /dev/null +++ b/maintainers/scripts/bootstrap-files/README.md @@ -0,0 +1,85 @@ +# Bootstrap files + +Currently `nixpkgs` builds most of it's packages using bootstrap seed +binaries (without the reliance on external inputs): + +- `bootstrap-tools`: an archive with the compiler toolchain and other + helper tools enough to build the rest of the `nixpkgs`. +- initial binaries needed to unpack `bootstrap-tools.*`. On `linux` + it's just `busybox`, on `darwin` it's `sh`, `bzip2`, `mkdir` and + `cpio`. These binaries can be executed directly from the store. + +These are called "bootstrap files". + +Bootstrap files should always be fetched from hydra and uploaded to +`tarballs.nixos.org` to guarantee that all the binaries were built from +the code committed into `nixpkgs` repository. + +The uploads to `tarballs.nixos.org` are done by `@lovesegfault` today. + +This document describes the procedure of updating bootstrap files in +`nixpkgs`. + +## How to request the bootstrap seed update + +To get the tarballs updated let's use an example `i686-unknown-linux-gnu` +target: + +1. Create a local update: + + ``` + $ maintainers/scripts/bootstrap-files/refresh-tarballs.bash --commit --targets=i686-unknown-linux-gnu + ``` + +2. Test the update locally. I'll build local `hello` derivation with + the result: + + ``` + $ nix-build -A hello --argstr system i686-linux + ``` + + To validate cross-targets `binfmt` `NixOS` helper can be useful. + For `riscv64-unknown-linux-gnu` the `/etc/nixox/configuraqtion.nix` + entry would be `boot.binfmt.emulatedSystems = [ "riscv64-linux" ]`. + +3. Propose the commit as a PR to update bootstrap tarballs, tag people + who can help you test the updated architecture and once reviewed tag + `@lovesegfault` to upload the tarballs. + +## Bootstrap files job definitions + +There are two types of bootstrap files: + +- natively built `stdenvBootstrapTools.build` hydra jobs in + [`nixpkgs:trunk`](https://hydra.nixos.org/jobset/nixpkgs/trunk#tabs-jobs) + jobset. Incomplete list of examples is: + + * `aarch64-unknown-linux-musl.nix` + * `i686-unknown-linux-gnu.nix` + + These are Tier 1 hydra platforms. + +- cross-built by `bootstrapTools.build` hydra jobs in + [`nixpkgs:cross-trunk`](https://hydra.nixos.org/jobset/nixpkgs/cross-trunk#tabs-jobs) + jobset. Incomplete list of examples is: + + * `mips64el-unknown-linux-gnuabi64.nix` + * `mips64el-unknown-linux-gnuabin32.nix` + * `mipsel-unknown-linux-gnu.nix` + * `powerpc64le-unknown-linux-gnu.nix` + * `riscv64-unknown-linux-gnu.nix` + + These are usually Tier 2 and lower targets. + +The `.build` job contains `/on-server/` subdirectory with binaries to +be uploaded to `tarballs.nixos.org`. +The files are uploaded to `tarballs.nixos.org` by writers to `S3` store. + +## TODOs + +- `pkgs/stdenv/darwin` file layout is slightly different from + `pkgs/stdenv/linux`. Once `linux` seed update becomes a routine we can + bring `darwin` in sync if it's feasible. +- `darwin` definition of `.build` `on-server/` directory layout differs + and should be updated. + diff --git a/maintainers/scripts/bootstrap-files/refresh-tarballs.bash b/maintainers/scripts/bootstrap-files/refresh-tarballs.bash new file mode 100755 index 000000000000..21c43ade27f1 --- /dev/null +++ b/maintainers/scripts/bootstrap-files/refresh-tarballs.bash @@ -0,0 +1,282 @@ +#!/usr/bin/env nix-shell +#! nix-shell --pure +#! nix-shell -i bash +#! nix-shell -p curl cacert +#! nix-shell -p git +#! nix-shell -p nix +#! nix-shell -p jq + +# How the refresher works: +# +# For a given list of : +# 1. fetch latest successful '.build` job +# 2. fetch oldest evaluation that contained that '.build', extract nixpkgs commit +# 3. fetch all the `.build` artifacts from '$out/on-server/' directory +# 4. calculate hashes and craft the commit message with the details on +# how to upload the result to 'tarballs.nixos.org' + +usage() { + cat >&2 <[,,...] + + The tool must be ran from the root directory of 'nixpkgs' repository. + +Synopsis: + 'refresh-tarballs.bash' script fetches latest bootstrapFiles built + by hydra, registers them in 'nixpkgs' and provides commands to + upload seed files to 'tarballs.nixos.org'. + + This is usually done in the following cases: + + 1. Single target fix: current bootstrap files for a single target + are problematic for some reason (target-specific bug). In this + case we can refresh just that target as: + + \$ $0 --commit --targets=i686-unknown-linux-gnu + + 2. Routine refresh: all bootstrap files should be refreshed to avoid + debugging problems that only occur on very old binaries. + + \$ $0 --commit --all-targets + +To get help on uploading refreshed binaries to 'tarballs.nixos.org' +please have a look at . +EOF + exit 1 +} + +# log helpers + +die() { + echo "ERROR: $*" >&2 + exit 1 +} + +info() { + echo "INFO: $*" >&2 +} + +[[ ${#@} -eq 0 ]] && usage + +# known targets + +NATIVE_TARGETS=( + aarch64-unknown-linux-gnu + aarch64-unknown-linux-musl + i686-unknown-linux-gnu + x86_64-unknown-linux-gnu + x86_64-unknown-linux-musl + + # TODO: add darwin here once a few prerequisites are satisfied: + # - bootstrap-files are factored out into a separate file + # - the build artifacts are factored out into an `on-server` + # directory. Right onw if does not match `linux` layout. + # + #aarch64-apple-darwin + #x86_64-apple-darwin +) + +is_native() { + local t target=$1 + for t in "${NATIVE_TARGETS[@]}"; do + [[ $t == $target ]] && return 0 + done + return 1 +} + +CROSS_TARGETS=( + armv5tel-unknown-linux-gnueabi + armv6l-unknown-linux-gnueabihf + armv6l-unknown-linux-musleabihf + armv7l-unknown-linux-gnueabihf + mips64el-unknown-linux-gnuabi64 + mips64el-unknown-linux-gnuabin32 + mipsel-unknown-linux-gnu + powerpc64le-unknown-linux-gnu + riscv64-unknown-linux-gnu +) + +is_cross() { + local t target=$1 + for t in "${CROSS_TARGETS[@]}"; do + [[ $t == $target ]] && return 0 + done + return 1 +} + +# collect passed options + +targets=() +commit=no + +for arg in "$@"; do + case "$arg" in + --all-targets) + targets+=( + ${CROSS_TARGETS[@]} + ${NATIVE_TARGETS[@]} + ) + ;; + --targets=*) + # Convert "--targets=a,b,c" to targets=(a b c) bash array. + comma_targets=${arg#--targets=} + targets+=(${comma_targets//,/ }) + ;; + --commit) + commit=yes + ;; + *) + usage + ;; + esac +done + +for target in "${targets[@]}"; do + # Native and cross jobsets differ a bit. We'll have to pick the + # one based on target name: + if is_native $target; then + jobset=nixpkgs/trunk + job="stdenvBootstrapTools.${target}.build" + elif is_cross $target; then + jobset=nixpkgs/cross-trunk + job="bootstrapTools.${target}.build" + else + die "'$target' is not present in either of 'NATIVE_TARGETS' or 'CROSS_TARGETS'. Please add one." + fi + + # 'nixpkgs' prefix where we will write new tarball hashes + case "$target" in + *linux*) nixpkgs_prefix="pkgs/stdenv/linux" ;; + *darwin*) nixpkgs_prefix="pkgs/stdenv/darwin" ;; + *) die "don't know where to put '$target'" ;; + esac + + # We enforce s3 prefix for all targets here. This slightly differs + # from manual uploads targets where names were chosen inconsistently. + s3_prefix="stdenv/$target" + + # resolve 'latest' build to the build 'id', construct the link. + latest_build_uri="https://hydra.nixos.org/job/$jobset/$job/latest" + latest_build="$target.latest-build" + info "Fetching latest successful build from '${latest_build_uri}'" + curl -s -H "Content-Type: application/json" -L "$latest_build_uri" > "$latest_build" + [[ $? -ne 0 ]] && die "Failed to fetch latest successful build" + latest_build_id=$(jq '.id' < "$latest_build") + [[ $? -ne 0 ]] && die "Did not find 'id' in latest build" + build_uri="https://hydra.nixos.org/build/${latest_build_id}" + + # We pick oldest jobset evaluation and extract the 'nicpkgs' commit. + # + # We use oldest instead of latest to make the result more stable + # across unrelated 'nixpkgs' updates. Ideally two subsequent runs of + # this refresher should produce the same output (provided there are + # no bootstrapTools updates committed between the two runs). + oldest_eval_id=$(jq '.jobsetevals|min' < "$latest_build") + [[ $? -ne 0 ]] && die "Did not find 'jobsetevals' in latest build" + eval_uri="https://hydra.nixos.org/eval/${oldest_eval_id}" + eval_meta="$target.eval-meta" + info "Fetching oldest eval details from '${eval_uri}' (can take a minute)" + curl -s -H "Content-Type: application/json" -L "${eval_uri}" > "$eval_meta" + [[ $? -ne 0 ]] && die "Failed to fetch eval metadata" + nixpkgs_revision=$(jq --raw-output ".jobsetevalinputs.nixpkgs.revision" < "$eval_meta") + [[ $? -ne 0 ]] && die "Failed to fetch revision" + + # Extract the build paths out of the build metadata + drvpath=$(jq --raw-output '.drvpath' < "${latest_build}") + [[ $? -ne 0 ]] && die "Did not find 'drvpath' in latest build" + outpath=$(jq --raw-output '.buildoutputs.out.path' < "${latest_build}") + [[ $? -ne 0 ]] && die "Did not find 'buildoutputs' in latest build" + build_timestamp=$(jq --raw-output '.timestamp' < "${latest_build}") + [[ $? -ne 0 ]] && die "Did not find 'timestamp' in latest build" + build_time=$(TZ=UTC LANG=C date --date="@${build_timestamp}" --rfc-email) + [[ $? -ne 0 ]] && die "Failed to format timestamp" + + info "Fetching bootstrap tools to calculate hashes from '${outpath}'" + nix-store --realize "$outpath" + [[ $? -ne 0 ]] && die "Failed to fetch '${outpath}' from hydra" + + fnames=() + + target_file="${nixpkgs_prefix}/bootstrap-files/${target}.nix" + info "Writing '${target_file}'" + { + # header + cat < { + url = "http://tarballs.nixos.org/${s3_prefix}/${nixpkgs_revision}/$fname"; + hash = "${sri}";$(printf "\n%s" "${executable_nix}") + }; +EOF + done + # footer + cat < "${target_file}" + + target_file_commit_msg=${target}.commit_message + cat > "$target_file_commit_msg" < Date: Sun, 28 Jan 2024 15:46:31 +0000 Subject: [PATCH 25/40] python311Packages.blebox-uniapi: 2.2.0 -> 2.2.1 --- pkgs/development/python-modules/blebox-uniapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blebox-uniapi/default.nix b/pkgs/development/python-modules/blebox-uniapi/default.nix index f93ef838751f..7436f6309152 100644 --- a/pkgs/development/python-modules/blebox-uniapi/default.nix +++ b/pkgs/development/python-modules/blebox-uniapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "blebox-uniapi"; - version = "2.2.0"; + version = "2.2.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "blebox"; repo = "blebox_uniapi"; rev = "refs/tags/v${version}"; - hash = "sha256-cLSI6wa3gHE0QkSVVWMNpb5fyQy0TLDNSqOuGlDJGJc="; + hash = "sha256-aVYk/N8dH0jc9BLQ2nZXulMCUqwEWpSX/JTiAxdn2sM="; }; postPatch = '' From bed3a0ff1cec02f178aabc4d1c0a99b2d4c4b5eb Mon Sep 17 00:00:00 2001 From: D3vil0p3r Date: Sun, 28 Jan 2024 16:07:34 +0100 Subject: [PATCH 26/40] fuchsia-cursor: init at 2.0.0 --- pkgs/by-name/fu/fuchsia-cursor/package.nix | 60 ++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 pkgs/by-name/fu/fuchsia-cursor/package.nix diff --git a/pkgs/by-name/fu/fuchsia-cursor/package.nix b/pkgs/by-name/fu/fuchsia-cursor/package.nix new file mode 100644 index 000000000000..96fd659e47e7 --- /dev/null +++ b/pkgs/by-name/fu/fuchsia-cursor/package.nix @@ -0,0 +1,60 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, clickgen +, python3 +, themeVariants ? [] +, sizeVariants ? [] +, platformVariants ? [] +}: + +let + pname = "fuchsia-cursor"; +in +lib.checkListOfEnum "${pname}: theme variants" [ "Fuchsia" "Fuchsia-Pop" "Fuchsia-Red" ] themeVariants +lib.checkListOfEnum "${pname}: size variants" [ "16" "24" "32" "48" ] sizeVariants +lib.checkListOfEnum "${pname}: platform variants" [ "x11" "windows" ] platformVariants + +stdenvNoCC.mkDerivation rec { + inherit pname; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "ful1e5"; + repo = pname; + rev = "v${version}"; + hash = "sha256-WnDtUsjRXT7bMppgwU5BIDqphP69DmPzQM/0qXES5tM="; + }; + + nativeBuildInputs = [ + clickgen + python3.pkgs.attrs + ]; + + installPhase = '' + runHook preInstall + + ${if themeVariants != [] then '' + name= ctgen build.toml \ + ${lib.optionalString (themeVariants != []) "-d bitmaps/" + toString themeVariants + " -n " + toString themeVariants} \ + ${lib.optionalString (sizeVariants != []) "-s " + toString sizeVariants} \ + ${lib.optionalString (platformVariants != []) "-p " + toString platformVariants} \ + -o $out/share/icons + '' else '' + name= ctgen build.toml -d bitmaps/Fuchsia -n Fuchsia \ + ${lib.optionalString (sizeVariants != []) "-s " + toString sizeVariants} \ + ${lib.optionalString (platformVariants != []) "-p " + toString platformVariants} \ + -o $out/share/icons + ''} + + runHook postInstall + ''; + + meta = with lib; { + description = "First OpenSource port of FuchsiaOS's cursors for Linux and Windows"; + homepage = "https://github.com/ful1e5/fuchsia-cursor"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = platforms.all; + license = licenses.gpl3Plus; + }; +} From d6768021188d1936d71374885d560e0c2700a7f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Jan 2024 17:07:07 +0000 Subject: [PATCH 27/40] api-linter: 1.63.2 -> 1.63.3 --- pkgs/development/tools/api-linter/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/api-linter/default.nix b/pkgs/development/tools/api-linter/default.nix index d1ce3fde4464..97bda5410596 100644 --- a/pkgs/development/tools/api-linter/default.nix +++ b/pkgs/development/tools/api-linter/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "api-linter"; - version = "1.63.2"; + version = "1.63.3"; src = fetchFromGitHub { owner = "googleapis"; repo = "api-linter"; rev = "v${version}"; - hash = "sha256-xbYu/5E3rkH5VUuH0fCs2gfpWysDVABxY+pA4JkU5WY="; + hash = "sha256-mcmp3M9KhZp3j18jh+3v5fwPPLRs2hkrRUN3RM/zCmo="; }; - vendorHash = "sha256-SDfErsM9wC1bGgBwcMRvjTOzqGNQ3kIQM7XeL4sLTC8="; + vendorHash = "sha256-/z2FqMyZnn2A5aajimTS2zw3A1v5v0uYZY81acuQOnw="; subPackages = [ "cmd/api-linter" ]; @@ -23,14 +23,6 @@ buildGoModule rec { "-w" ]; - # reference: https://github.com/googleapis/api-linter/blob/v1.63.2/.github/workflows/release.yaml#L76 - preBuild = '' - cat > cmd/api-linter/version.go < Date: Sun, 28 Jan 2024 18:57:03 +0100 Subject: [PATCH 28/40] nightfox-gtk-theme: init at unstable-2023-05-28 --- .../by-name/ni/nightfox-gtk-theme/package.nix | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/ni/nightfox-gtk-theme/package.nix diff --git a/pkgs/by-name/ni/nightfox-gtk-theme/package.nix b/pkgs/by-name/ni/nightfox-gtk-theme/package.nix new file mode 100644 index 000000000000..2e19c9ea50e2 --- /dev/null +++ b/pkgs/by-name/ni/nightfox-gtk-theme/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gnome-themes-extra +, gtk-engine-murrine +}: + +stdenvNoCC.mkDerivation { + pname = "nightfox-gtk-theme"; + version = "unstable-2023-05-28"; + + src = fetchFromGitHub { + owner = "Fausto-Korpsvart"; + repo = "Nightfox-GTK-Theme"; + rev = "a8b01a28f2d1d9dd57d98d3708602b0d72340338"; + hash = "sha256-GrlKYCqO9vgRbPdPhugPBg2rYtDxzbQwRPtTBIyIyx4="; + }; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + buildInputs = [ + gnome-themes-extra + ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + cp -a themes/* $out/share/themes + runHook postInstall + ''; + + meta = with lib; { + description = "A GTK theme based on the Nightfox colour palette"; + homepage = "https://github.com/Fausto-Korpsvart/Nightfox-GTK-Theme"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = platforms.unix; + }; +} From 141fcec0326bfbccea419ecf3f92cc2e93b8a229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 17 Jan 2024 00:57:59 +0100 Subject: [PATCH 29/40] python311Packages.celery: use xdist to speed up checkPhase Before the tests took ~110 sec, now they only take ~19 sec. One tests seems to fail because of that but with subtests we have 30k tests which should verify that things work regardless. --- pkgs/development/python-modules/celery/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 7c22634f2a3c..fa7ebb248adb 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -18,6 +18,7 @@ , pytest-click , pytest-subtests , pytest-timeout +, pytest-xdist , pytestCheckHook , python-dateutil , pythonOlder @@ -63,6 +64,7 @@ buildPythonPackage rec { pytest-click pytest-subtests pytest-timeout + pytest-xdist pytestCheckHook ]; @@ -77,6 +79,10 @@ buildPythonPackage rec { disabledTests = [ "msgpack" "test_check_privileges_no_fchown" + # fails with pytest-xdist + "test_itercapture_limit" + "test_stamping_headers_in_options" + "test_stamping_with_replace" ] ++ lib.optionals stdenv.isDarwin [ # too many open files on hydra "test_cleanup" From ec740c7b63661485e26d794ac775d87f17098fd4 Mon Sep 17 00:00:00 2001 From: Fl1tzi Date: Mon, 22 Jan 2024 16:28:32 +0100 Subject: [PATCH 30/40] cosmic-comp: optional useXWayland Signed-off-by: Fl1tzi --- pkgs/by-name/co/cosmic-comp/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix index 29864f1cd8d0..cfe8d9defc81 100644 --- a/pkgs/by-name/co/cosmic-comp/package.nix +++ b/pkgs/by-name/co/cosmic-comp/package.nix @@ -12,6 +12,7 @@ , xwayland , wayland , xorg +, useXWayland ? true }: rustPlatform.buildRustPackage { @@ -56,11 +57,13 @@ rustPlatform.buildRustPackage { # These libraries are only used by the X11 backend, which will not # be the common case, so just make them available, don't link them. postInstall = '' - wrapProgram $out/bin/cosmic-comp \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ + wrapProgramArgs=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr - ]} \ - --prefix PATH : ${lib.makeBinPath [ xwayland ]} + ]}) + '' + lib.optionalString useXWayland '' + wrapProgramArgs+=(--prefix PATH : ${lib.makeBinPath [ xwayland ]}) + '' + '' + wrapProgram $out/bin/cosmic-comp "''${wrapProgramArgs[@]}" ''; meta = with lib; { From 2cfc714455a9eb004aa7152fe86f2d3edbc9c0b7 Mon Sep 17 00:00:00 2001 From: Fl1tzi Date: Sat, 20 Jan 2024 21:50:23 +0100 Subject: [PATCH 31/40] cosmic-comp: optional useSystemd Allow the optional use of Systemd by turning off the default features. Also see: https://github.com/pop-os/cosmic-comp/blob/e569e14a99c6471dd7b9536d795448f2a8c8c948/Cargo.toml Signed-off-by: Fl1tzi --- pkgs/by-name/co/cosmic-comp/package.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix index cfe8d9defc81..bd7d147cfeb0 100644 --- a/pkgs/by-name/co/cosmic-comp/package.nix +++ b/pkgs/by-name/co/cosmic-comp/package.nix @@ -1,4 +1,5 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub , makeBinaryWrapper @@ -13,6 +14,8 @@ , wayland , xorg , useXWayland ? true +, systemd +, useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd }: rustPlatform.buildRustPackage { @@ -42,7 +45,18 @@ rustPlatform.buildRustPackage { separateDebugInfo = true; nativeBuildInputs = [ makeBinaryWrapper pkg-config ]; - buildInputs = [ libglvnd libinput libxkbcommon mesa seatd udev wayland ]; + buildInputs = [ + libglvnd + libinput + libxkbcommon + mesa + seatd + udev + wayland + ] ++ lib.optional useSystemd systemd; + + # Only default feature is systemd + buildNoDefaultFeatures = !useSystemd; # Force linking to libEGL, which is always dlopen()ed, and to # libwayland-client, which is always dlopen()ed except by the From bde0a4ee577e200628811a3ad95e8b36020206ec Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Mon, 1 Jan 2024 17:59:31 -0800 Subject: [PATCH 32/40] python311Packages.sharp-aquos-rc: init at 0.4 --- .../python-modules/sharp-aquos-rc/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/sharp-aquos-rc/default.nix diff --git a/pkgs/development/python-modules/sharp-aquos-rc/default.nix b/pkgs/development/python-modules/sharp-aquos-rc/default.nix new file mode 100644 index 000000000000..5dc7580467e8 --- /dev/null +++ b/pkgs/development/python-modules/sharp-aquos-rc/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pyyaml +}: + +buildPythonPackage rec { + pname = "sharp-aquos-rc"; + version = "0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jmoore987"; + repo = "sharp_aquos_rc"; + rev = "refs/tags/${version}"; + hash = "sha256-w/XA58iT/pmNCy9up5fayjxBsevzgr8ImKgPiNtYHAM="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ pyyaml ]; + + # No tests + doCheck = false; + + pythonImportsCheck = [ "sharp_aquos_rc" ]; + + meta = with lib; { + homepage = "https://github.com/jmoore987/sharp_aquos_rc"; + description = "Control Sharp Aquos SmartTVs through the IP interface"; + changelog = "https://github.com/jmoore987/sharp_aquos_rc/releases/tag/${version}"; + maintainers = with maintainers; [ jamiemagee ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b7c97525ccd5..661cf99e93f0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13186,6 +13186,8 @@ self: super: with self; { sharkiq = callPackage ../development/python-modules/sharkiq { }; + sharp-aquos-rc = callPackage ../development/python-modules/sharp-aquos-rc { }; + shazamio = callPackage ../development/python-modules/shazamio { }; sh = callPackage ../development/python-modules/sh { }; From 833b32e19d4b0413d852806050dff5d4c9810f89 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Mon, 1 Jan 2024 18:00:09 -0800 Subject: [PATCH 33/40] home-assistant: update component packages --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index abfb8c7b9417..a00b6523d995 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -226,7 +226,8 @@ aqualogic ]; "aquostv" = ps: with ps; [ - ]; # missing inputs: sharp_aquos_rc + sharp-aquos-rc + ]; "aranet" = ps: with ps; [ aioesphomeapi aiohttp-cors From eb3b90ac41f00d310db14bfafaa4aa4492a988d8 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 28 Jan 2024 15:04:52 -0500 Subject: [PATCH 34/40] helix-gpt: init at 0.15 --- pkgs/by-name/he/helix-gpt/package.nix | 63 +++++++++++++++++++++++++++ pkgs/by-name/he/helix-gpt/pin.json | 6 +++ 2 files changed, 69 insertions(+) create mode 100644 pkgs/by-name/he/helix-gpt/package.nix create mode 100644 pkgs/by-name/he/helix-gpt/pin.json diff --git a/pkgs/by-name/he/helix-gpt/package.nix b/pkgs/by-name/he/helix-gpt/package.nix new file mode 100644 index 000000000000..4c39a7b357cf --- /dev/null +++ b/pkgs/by-name/he/helix-gpt/package.nix @@ -0,0 +1,63 @@ +{ stdenv, lib, fetchFromGitHub, bun, makeBinaryWrapper }: +let + pin = lib.importJSON ./pin.json; + src = fetchFromGitHub { + owner = "leona"; + repo = "helix-gpt"; + rev = pin.version; + hash = pin.srcHash; + }; + node_modules = stdenv.mkDerivation { + pname = "helix-gpt-node_modules"; + inherit src; + version = pin.version; + impureEnvVars = lib.fetchers.proxyImpureEnvVars + ++ [ "GIT_PROXY_COMMAND" "SOCKS_SERVER" ]; + nativeBuildInputs = [ bun ]; + dontConfigure = true; + buildPhase = '' + bun install --no-progress --frozen-lockfile + ''; + installPhase = '' + mkdir -p $out/node_modules + + cp -R ./node_modules $out + ''; + outputHash = pin."${stdenv.system}"; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + }; +in +stdenv.mkDerivation { + pname = "helix-gpt"; + version = pin.version; + inherit src; + nativeBuildInputs = [ makeBinaryWrapper ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + + ln -s ${node_modules}/node_modules $out + cp -R ./* $out + + # bun is referenced naked in the package.json generated script + makeBinaryWrapper ${bun}/bin/bun $out/bin/helix-gpt \ + --prefix PATH : ${lib.makeBinPath [ bun ]} \ + --add-flags "run --prefer-offline --no-install --cwd $out ./src/app.ts" + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/leona/helix-gpt"; + description = "Code completion LSP for Helix with support for Copilot + OpenAI"; + maintainers = with maintainers; [ happysalada ]; + license = with licenses; [ mit ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/by-name/he/helix-gpt/pin.json b/pkgs/by-name/he/helix-gpt/pin.json new file mode 100644 index 000000000000..ab2a52bb0968 --- /dev/null +++ b/pkgs/by-name/he/helix-gpt/pin.json @@ -0,0 +1,6 @@ +{ + "version": "0.15", + "srcHash": "sha256-95NnV//DesXQB1ttvOylu1DAnmRcvTUpZzK1NTZtuVE=", + "x86_64-linux": "sha256-h6wGkOfSbB8Rwm7eFvcowDdH1RdS6eFaxgf+SdYvYt8=", + "x86_64-darwin": "sha256-45RFY4Kqt5ooMOY75oJcSUZdkERzpyIMQkni4NJ/s1Y=" +} From 3d745e6ce9931ab6035586f2cdc3804879d8be7f Mon Sep 17 00:00:00 2001 From: Tomo <68489118+Tomodachi94@users.noreply.github.com> Date: Thu, 25 Jan 2024 02:33:16 -0800 Subject: [PATCH 35/40] craftos-pc: 2.8 -> 2.8.1 Changelog: https://github.com/MCJack123/craftos2/releases/tag/v2.8.1 --- .../emulators/craftos-pc/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/emulators/craftos-pc/default.nix b/pkgs/applications/emulators/craftos-pc/default.nix index 9c1c31c689ca..12c86c3680f8 100644 --- a/pkgs/applications/emulators/craftos-pc/default.nix +++ b/pkgs/applications/emulators/craftos-pc/default.nix @@ -16,18 +16,18 @@ }: let - version = "2.8"; + version = "2.8.1"; craftos2-lua = fetchFromGitHub { owner = "MCJack123"; repo = "craftos2-lua"; rev = "v${version}"; - hash = "sha256-xuNcWt3Wnh3WlYe6pB4dvP3PY9S5ghL9QQombGn8iyY="; + hash = "sha256-8bl83AOIWtUQ06F2unYEF08VT13o9EGo9YDZpdNxd8w="; }; craftos2-rom = fetchFromGitHub { owner = "McJack123"; repo = "craftos2-rom"; rev = "v${version}"; - hash = "sha256-WZs/KIdpqLLzvpH2hiJpe/AehluoQMtewBbAb4htz8k="; + hash = "sha256-aCRJ3idSrRM8ydt8hP8nA1RR0etPnWpQKphXcOGgTfk="; }; in @@ -39,18 +39,9 @@ stdenv.mkDerivation rec { owner = "MCJack123"; repo = "craftos2"; rev = "v${version}"; - hash = "sha256-nT/oN2XRU1Du1/IHlkRCzLqFwQ5s9Sr4FQs3ES+aPFs="; + hash = "sha256-iQCv4EDdqmnU0fYxMwpCZ2Z5p43P0MGBNIG/dZrWndg="; }; - patches = [ - ( # Fixes CCEmuX. This is a one-character change that did not make it into the release. - fetchpatch { - url = "https://github.com/MCJack123/craftos2/commit/9ef7e16b69ead69b5fe076724842a1e24b3de058.patch"; - hash = "sha256-SjNnsooDFt3JoVOO0xf6scrGXEQQmrQf91GY7VWaTOw="; - } - ) - ]; - buildInputs = [ patchelf poco openssl SDL2 SDL2_mixer ncurses libpng pngpp libwebp ]; preBuild = '' From 58bea8a94cca704fbb03a8db61a28ed36bd9b4e7 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 28 Jan 2024 21:23:27 +0100 Subject: [PATCH 36/40] rmg: 0.5.6 -> 0.5.7 --- pkgs/by-name/rm/rmg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rm/rmg/package.nix b/pkgs/by-name/rm/rmg/package.nix index da1120e9b9f0..908a5d2fe96d 100644 --- a/pkgs/by-name/rm/rmg/package.nix +++ b/pkgs/by-name/rm/rmg/package.nix @@ -26,13 +26,13 @@ let in stdenv.mkDerivation rec { pname = "rmg"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "Rosalie241"; repo = "RMG"; rev = "v${version}"; - hash = "sha256-2MrqHSz76gPqU7ajccHUhbyf4lYuDraxdMnifbtQ0o8="; + hash = "sha256-j3OVhcTGUXPC0+AqvAJ7+mc+IFqJeBITU99pvfXIunQ="; }; nativeBuildInputs = [ From fb95ecbbe24d0edb63bc1482cc8f476ecd050f7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Jan 2024 16:36:31 +0000 Subject: [PATCH 37/40] samtools: 1.19 -> 1.19.2 --- pkgs/applications/science/biology/samtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index 7db1edcbe9e9..70f436a088e1 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "samtools"; - version = "1.19"; + version = "1.19.2"; src = fetchurl { url = "https://github.com/samtools/samtools/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-+ms7GOIIUbbzy1WvrzIF0C/LedrjuEn89S6PwQ/wi4M="; + hash = "sha256-cfYEmWaOTAjn10X7/yTBXMigl3q6sazV0rtBm9sGXpY="; }; # tests require `bgzip` from the htslib package From 0abe7e75d23e2c460034cf40a73527239444ec9d Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 28 Jan 2024 21:41:04 +0100 Subject: [PATCH 38/40] rmg: Fetch patch for bad GNUInstallDirs variable concatenation Fixes startup --- pkgs/by-name/rm/rmg/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/rm/rmg/package.nix b/pkgs/by-name/rm/rmg/package.nix index 908a5d2fe96d..8c6f22ea1bed 100644 --- a/pkgs/by-name/rm/rmg/package.nix +++ b/pkgs/by-name/rm/rmg/package.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , boost , cmake , discord-rpc @@ -35,6 +36,16 @@ stdenv.mkDerivation rec { hash = "sha256-j3OVhcTGUXPC0+AqvAJ7+mc+IFqJeBITU99pvfXIunQ="; }; + patches = [ + # Fix bad concatenation of CMake GNUInstallDirs variables, causing broken asset lookup paths + # Remove when version > 0.5.7 + (fetchpatch { + name = "0001-rmg-Fix-GNUInstallDirs-usage.patch"; + url = "https://github.com/Rosalie241/RMG/commit/685aa597c7ee7ad7cfd4dd782f40d21863b75899.patch"; + hash = "sha256-HnaxUAX+3Z/VTtYYuhoXOtsDtV61nskgyzEcp8fdBsU="; + }) + ]; + nativeBuildInputs = [ cmake nasm From 0ac780fa944c5416f01e64593c9191514486a446 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 22 Jan 2024 21:18:00 +0100 Subject: [PATCH 39/40] rmg: Fix licensing - Fix meta.license - Offer an extra, default-false option to build with license-compromising plugin - Taint meta.license to unfree when used --- pkgs/by-name/rm/rmg/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/rm/rmg/package.nix b/pkgs/by-name/rm/rmg/package.nix index 8c6f22ea1bed..50436f36b928 100644 --- a/pkgs/by-name/rm/rmg/package.nix +++ b/pkgs/by-name/rm/rmg/package.nix @@ -20,6 +20,8 @@ , which , xdg-user-dirs , zlib +# Affects final license +, withAngrylionRdpPlus ? false }: let @@ -77,6 +79,7 @@ stdenv.mkDerivation rec { # mupen64plus-input-gca is written in Rust, so we can't build it with # everything else. "-DNO_RUST=ON" + "-DUSE_ANGRYLION=${lib.boolToString withAngrylionRdpPlus}" ]; qtWrapperArgs = lib.optionals stdenv.isLinux [ @@ -90,7 +93,7 @@ stdenv.mkDerivation rec { Rosalie's Mupen GUI is a free and open-source mupen64plus front-end written in C++. It offers a simple-to-use user interface. ''; - license = licenses.gpl3; + license = if withAngrylionRdpPlus then licenses.unfree else licenses.gpl3Only; platforms = platforms.linux; mainProgram = "RMG"; maintainers = with maintainers; [ slam-bert ]; From 18c51f5899b20527c7ad8fc8ae36a67eaadec3f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 28 Jan 2024 22:35:38 +0100 Subject: [PATCH 40/40] home-assistant-custom-lovelace-modules.light-entity-card: 6.1.1 -> 6.1.3 Diff: https://github.com/ljmerza/light-entity-card/compare/refs/tags/6.1.1...6.1.3 Changelog: https://github.com/ljmerza/light-entity-card/releases/tag/6.1.3 --- .../custom-lovelace-modules/light-entity-card/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/default.nix index 38b071f16564..529e2f736bb2 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/default.nix @@ -5,13 +5,13 @@ buildNpmPackage rec { pname = "light-entity-card"; - version = "6.1.1"; + version = "6.1.3"; src = fetchFromGitHub { owner = "ljmerza"; repo = "light-entity-card"; rev = "refs/tags/${version}"; - hash = "sha256-LoZt65oAw52NxVFgV9kVDr65CX5G6Xek2zDafDIxXmw="; + hash = "sha256-DtpNKcnxMWbKwfIwo9R2g2Vux9oAjTI0URixGC41qeA="; }; npmDepsHash = "sha256-EZDTWtn3joikwiC5Kfn94+tXRDpBhMDHqHozfIkfbJ0=";