From d93dd6e3a9dca169c454ae79ddd284e07b1c87a5 Mon Sep 17 00:00:00 2001 From: Stacky McStackface Date: Thu, 4 Sep 2025 08:18:34 +0000 Subject: [PATCH 1/3] chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@150b3d860a4c49bfef6dafe61d19d1d68b3835e7 Reference-to: stackabletech/operator-templating@150b3d8 (Fix the ARM build) --- .github/ISSUE_TEMPLATE/02-bug_report.yml | 5 ++- .github/ISSUE_TEMPLATE/bug_report.yml | 50 ------------------------ .github/workflows/build.yml | 14 +++---- .github/workflows/integration-test.yml | 8 ++-- .github/workflows/pr_pre-commit.yaml | 2 +- .pre-commit-config.yaml | 1 + 6 files changed, 16 insertions(+), 64 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml diff --git a/.github/ISSUE_TEMPLATE/02-bug_report.yml b/.github/ISSUE_TEMPLATE/02-bug_report.yml index 82523314..2847bfef 100644 --- a/.github/ISSUE_TEMPLATE/02-bug_report.yml +++ b/.github/ISSUE_TEMPLATE/02-bug_report.yml @@ -12,7 +12,8 @@ body: label: Affected Stackable version description: Which version of the Stackable Operator do you see this bug in? -# + # + - type: textarea attributes: label: Current and expected behavior @@ -34,7 +35,7 @@ body: attributes: label: Environment description: | - What type of kubernetes cluster you are running aginst (k3s/eks/aks/gke/other) and any other information about your environment? + What type of kubernetes cluster you are running against (k3s/eks/aks/gke/other) and any other information about your environment? placeholder: | Examples: Output of `kubectl version --short` diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml deleted file mode 100644 index 68015644..00000000 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ /dev/null @@ -1,50 +0,0 @@ ---- -name: "🐛 Bug Report" -description: "If something isn't working as expected 🤔." -labels: ["type/bug"] -body: - - type: markdown - attributes: - value: Thanks for taking the time to file a bug report! Please fill out this form as completely as possible. - - - type: input - attributes: - label: Affected Stackable version - description: Which version of the Stackable Operator do you see this bug in? - - - - type: textarea - attributes: - label: Current and expected behavior - description: A clear and concise description of what the operator is doing and what you would expect. - validations: - required: true - - - type: textarea - attributes: - label: Possible solution - description: "If you have suggestions on a fix for the bug." - - - type: textarea - attributes: - label: Additional context - description: "Add any other context about the problem here. Or a screenshot if applicable." - - - type: textarea - attributes: - label: Environment - description: | - What type of kubernetes cluster you are running aginst (k3s/eks/aks/gke/other) and any other information about your environment? - placeholder: | - Examples: - Output of `kubectl version --short` - - - type: dropdown - attributes: - label: Would you like to work on fixing this bug? - description: | - **NOTE**: Let us know if you would like to submit a PR for this. We are more than happy to help you through the process. - options: - - "yes" - - "no" - - "maybe" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b48719fa..eda6bb6d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -155,7 +155,7 @@ jobs: with: key: clippy cache-all-crates: "true" - # TODO (@Techassi): Remove this step (unmaintained action, kinda useless step anyway) + # TODO (@Techassi): Remove this step (unmaintained action, kinda useless step anyway) - name: Run clippy action to produce annotations uses: giraffate/clippy-action@13b9d32482f25d29ead141b79e7e04e7900281e0 # v1.0.1 env: @@ -165,7 +165,7 @@ jobs: clippy_flags: --all-targets -- -D warnings reporter: 'github-pr-review' github_token: ${{ secrets.GITHUB_TOKEN }} - # TODO (@Techassi): Remove, done by pre-commit + # TODO (@Techassi): Remove, done by pre-commit - name: Run clippy manually without annotations env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -345,9 +345,9 @@ jobs: with: toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }} components: rustfmt - # This step checks if the current run was triggered by a push to a pr (or a pr being created). - # If this is the case it changes the version of this project in all Cargo.toml files to include the suffix - # "-pr" so that the published artifacts can be linked to this PR. + # This step checks if the current run was triggered by a push to a pr (or a pr being created). + # If this is the case it changes the version of this project in all Cargo.toml files to include the suffix + # "-pr" so that the published artifacts can be linked to this PR. - uses: stackabletech/cargo-install-action@main with: crate: cargo-edit @@ -383,8 +383,8 @@ jobs: run: | # Installing helm and yq on ubicloud-standard-8-arm only if [ "$(arch)" = "aarch64" ]; then - curl https://baltocdn.com/helm/signing.asc | gpg --dearmor | sudo tee /usr/share/keyrings/helm.gpg > /dev/null - echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/helm.gpg] https://baltocdn.com/helm/stable/debian/ all main" | sudo tee /etc/apt/sources.list.d/helm-stable-debian.list + curl -fsSL https://packages.buildkite.com/helm-linux/helm-debian/gpgkey | gpg --dearmor | sudo tee /usr/share/keyrings/helm.gpg > /dev/null + echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/helm.gpg] https://packages.buildkite.com/helm-linux/helm-debian/any/ any main" | sudo tee /etc/apt/sources.list.d/helm-stable-debian.list sudo apt-get -y update sudo apt-get -y install helm sudo wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_arm64 -O /usr/bin/yq && sudo chmod +x /usr/bin/yq diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index b58d2bac..c3aa54ff 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -3,8 +3,8 @@ name: Integration Test on: # schedule: - # At 00:00 on Sunday. See: https://crontab.guru/#0_0_*_*_0 - # - cron: "0 0 * * 0" + # # At 00:00 on Sunday. See: https://crontab.guru/#0_0_*_*_0 + # - cron: "0 0 * * 0" workflow_dispatch: inputs: test-mode: @@ -40,7 +40,7 @@ jobs: # TODO: Enable the scheduled runs which hard-code what profile to use - name: Run Integration Test id: test - uses: stackabletech/actions/run-integration-test@736565e3b8f657bcddff2897abcf5ccb82ae3e6c # v0.9.0 + uses: stackabletech/actions/run-integration-test@bdac99602eb834b85fdddf207d68e51d0e8b9380 # v0.9.3 with: replicated-api-token: ${{ secrets.REPLICATED_API_TOKEN }} test-mode-input: ${{ inputs.test-mode-input }} @@ -50,7 +50,7 @@ jobs: - name: Send Notification if: ${{ failure() || github.run_attempt > 1 }} - uses: stackabletech/actions/send-slack-notification@736565e3b8f657bcddff2897abcf5ccb82ae3e6c # v0.9.0 + uses: stackabletech/actions/send-slack-notification@bdac99602eb834b85fdddf207d68e51d0e8b9380 # v0.9.3 with: slack-token: ${{ secrets.SLACK_INTEGRATION_TEST_TOKEN }} failed-tests: ${{ steps.test.outputs.failed-tests }} diff --git a/.github/workflows/pr_pre-commit.yaml b/.github/workflows/pr_pre-commit.yaml index 776d3ee5..2ebb1e9c 100644 --- a/.github/workflows/pr_pre-commit.yaml +++ b/.github/workflows/pr_pre-commit.yaml @@ -26,7 +26,7 @@ jobs: persist-credentials: false submodules: recursive fetch-depth: 0 - - uses: stackabletech/actions/run-pre-commit@736565e3b8f657bcddff2897abcf5ccb82ae3e6c # v0.9.0 + - uses: stackabletech/actions/run-pre-commit@bdac99602eb834b85fdddf207d68e51d0e8b9380 # v0.9.3 with: python-version: ${{ env.PYTHON_VERSION }} rust: ${{ env.RUST_TOOLCHAIN_VERSION }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d8f954a5..57524410 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -18,6 +18,7 @@ repos: rev: 79a6b2b1392eaf49cdd32ac4f14be1a809bbd8f7 # 1.37.1 hooks: - id: yamllint + args: ["--strict"] - repo: https://github.com/igorshubovych/markdownlint-cli rev: 192ad822316c3a22fb3d3cc8aa6eafa0b8488360 # 0.45.0 From 66489441d64ee5b91fb2d076e4ae9b6cad086144 Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Thu, 4 Sep 2025 10:33:53 +0200 Subject: [PATCH 2/3] Update package url --- Cargo.lock | 16 ++++++++-------- Cargo.nix | 19 ++++++++++--------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7c276062..0c503b15 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -802,9 +802,9 @@ checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" [[package]] name = "form_urlencoded" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" dependencies = [ "percent-encoding", ] @@ -1304,9 +1304,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" dependencies = [ "idna_adapter", "smallvec", @@ -1905,9 +1905,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pest" @@ -3433,9 +3433,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.4" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" +checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" dependencies = [ "form_urlencoded", "idna", diff --git a/Cargo.nix b/Cargo.nix index bcb038e3..15113ea2 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -2439,9 +2439,9 @@ rec { }; "form_urlencoded" = rec { crateName = "form_urlencoded"; - version = "1.2.1"; + version = "1.2.2"; edition = "2018"; - sha256 = "0milh8x7nl4f450s3ddhg57a3flcv6yq8hlkyk6fyr3mcb128dp1"; + sha256 = "1kqzb2qn608rxl3dws04zahcklpplkd5r1vpabwga5l50d2v4k6b"; authors = [ "The rust-url developers" ]; @@ -4182,9 +4182,9 @@ rec { }; "idna" = rec { crateName = "idna"; - version = "1.0.3"; + version = "1.1.0"; edition = "2018"; - sha256 = "0zlajvm2k3wy0ay8plr07w22hxkkmrxkffa6ah57ac6nci984vv8"; + sha256 = "1pp4n7hppm480zcx411dsv9wfibai00wbpgnjj4qj0xa7kr7a21v"; authors = [ "The rust-url developers" ]; @@ -6278,9 +6278,9 @@ rec { }; "percent-encoding" = rec { crateName = "percent-encoding"; - version = "2.3.1"; + version = "2.3.2"; edition = "2018"; - sha256 = "0gi8wgx0dcy8rnv1kywdv98lwcx67hz0a0zwpib5v2i08r88y573"; + sha256 = "083jv1ai930azvawz2khv7w73xh8mnylk7i578cifndjn5y64kwv"; libName = "percent_encoding"; authors = [ "The rust-url developers" @@ -11582,9 +11582,9 @@ rec { }; "url" = rec { crateName = "url"; - version = "2.5.4"; + version = "2.5.7"; edition = "2018"; - sha256 = "0q6sgznyy2n4l5lm16zahkisvc9nip9aa5q1pps7656xra3bdy1j"; + sha256 = "0nzghdv0kcksyvri0npxbjzyx2ihprks5k590y77bld355m17g08"; authors = [ "The rust-url developers" ]; @@ -11611,6 +11611,7 @@ rec { name = "serde"; packageId = "serde"; optional = true; + usesDefaultFeatures = false; features = [ "derive" ]; } ]; @@ -11624,7 +11625,7 @@ rec { features = { "default" = [ "std" ]; "serde" = [ "dep:serde" ]; - "std" = [ "idna/std" "percent-encoding/std" "form_urlencoded/std" ]; + "std" = [ "idna/std" "percent-encoding/std" "form_urlencoded/std" "serde/std" ]; }; resolvedDefaultFeatures = [ "default" "serde" "std" ]; }; From 7803b336394205766f81e3c8453201248d368170 Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Thu, 4 Sep 2025 10:34:15 +0200 Subject: [PATCH 3/3] Update package tracing-subscriber --- Cargo.lock | 72 +++++------------------ Cargo.nix | 165 ++++++++++------------------------------------------- 2 files changed, 45 insertions(+), 192 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0c503b15..fc200ccd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -762,8 +762,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" dependencies = [ "bit-set", - "regex-automata 0.4.9", - "regex-syntax 0.8.5", + "regex-automata", + "regex-syntax", ] [[package]] @@ -1652,11 +1652,11 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "matchers" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9" dependencies = [ - "regex-automata 0.1.10", + "regex-automata", ] [[package]] @@ -1705,12 +1705,11 @@ checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084" [[package]] name = "nu-ansi-term" -version = "0.46.0" +version = "0.50.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" dependencies = [ - "overload", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -1858,12 +1857,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - [[package]] name = "parking" version = "2.2.1" @@ -2218,17 +2211,8 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.9", - "regex-syntax 0.8.5", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", + "regex-automata", + "regex-syntax", ] [[package]] @@ -2239,15 +2223,9 @@ checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.5", + "regex-syntax", ] -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - [[package]] name = "regex-syntax" version = "0.8.5" @@ -3358,14 +3336,14 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" +checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5" dependencies = [ "matchers", "nu-ansi-term", "once_cell", - "regex", + "regex-automata", "serde", "serde_json", "sharded-slab", @@ -3598,22 +3576,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - [[package]] name = "winapi-util" version = "0.1.10" @@ -3623,12 +3585,6 @@ dependencies = [ "windows-sys 0.60.2", ] -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - [[package]] name = "windows-core" version = "0.61.2" diff --git a/Cargo.nix b/Cargo.nix index 15113ea2..8685f8b7 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -2316,13 +2316,13 @@ rec { } { name = "regex-automata"; - packageId = "regex-automata 0.4.9"; + packageId = "regex-automata"; usesDefaultFeatures = false; features = [ "alloc" "syntax" "meta" "nfa" "dfa" "hybrid" ]; } { name = "regex-syntax"; - packageId = "regex-syntax 0.8.5"; + packageId = "regex-syntax"; usesDefaultFeatures = false; } ]; @@ -5432,19 +5432,23 @@ rec { }; "matchers" = rec { crateName = "matchers"; - version = "0.1.0"; + version = "0.2.0"; edition = "2018"; - sha256 = "0n2mbk7lg2vf962c8xwzdq96yrc9i0p8dbmm4wa1nnkcp1dhfqw2"; + sha256 = "1sasssspdj2vwcwmbq3ra18d3qniapkimfcbr47zmx6750m5llni"; authors = [ "Eliza Weisman " ]; dependencies = [ { name = "regex-automata"; - packageId = "regex-automata 0.1.10"; + packageId = "regex-automata"; + usesDefaultFeatures = false; + features = [ "syntax" "dfa-build" "dfa-search" ]; } ]; - + features = { + "unicode" = [ "regex-automata/unicode" ]; + }; }; "matchit" = rec { crateName = "matchit"; @@ -5576,9 +5580,9 @@ rec { }; "nu-ansi-term" = rec { crateName = "nu-ansi-term"; - version = "0.46.0"; - edition = "2018"; - sha256 = "115sywxh53p190lyw97alm14nc004qj5jm5lvdj608z84rbida3p"; + version = "0.50.1"; + edition = "2021"; + sha256 = "16a3isvbxx8pa3lk71h3cq2fsx2d17zzq42j4mhpxy81gl2qx8nl"; libName = "nu_ansi_term"; authors = [ "ogham@bsago.me" @@ -5588,14 +5592,11 @@ rec { ]; dependencies = [ { - name = "overload"; - packageId = "overload"; - } - { - name = "winapi"; - packageId = "winapi"; - target = { target, features }: ("windows" == target."os" or null); - features = [ "consoleapi" "errhandlingapi" "fileapi" "handleapi" "processenv" ]; + name = "windows-sys"; + packageId = "windows-sys 0.52.0"; + rename = "windows"; + target = { target, features }: (target."windows" or false); + features = [ "Win32_Foundation" "Win32_System_Console" "Win32_Storage_FileSystem" "Win32_Security" ]; } ]; features = { @@ -6157,16 +6158,6 @@ rec { }; resolvedDefaultFeatures = [ "default" "std" ]; }; - "overload" = rec { - crateName = "overload"; - version = "0.1.1"; - edition = "2018"; - sha256 = "0fdgbaqwknillagy1xq7xfgv60qdbk010diwl7s1p0qx7hb16n5i"; - authors = [ - "Daniel Salvadori " - ]; - - }; "parking" = rec { crateName = "parking"; version = "2.2.1"; @@ -7176,13 +7167,13 @@ rec { } { name = "regex-automata"; - packageId = "regex-automata 0.4.9"; + packageId = "regex-automata"; usesDefaultFeatures = false; features = [ "alloc" "syntax" "meta" "nfa-pikevm" ]; } { name = "regex-syntax"; - packageId = "regex-syntax 0.8.5"; + packageId = "regex-syntax"; usesDefaultFeatures = false; } ]; @@ -7210,32 +7201,7 @@ rec { }; resolvedDefaultFeatures = [ "default" "perf" "perf-backtrack" "perf-cache" "perf-dfa" "perf-inline" "perf-literal" "perf-onepass" "std" "unicode" "unicode-age" "unicode-bool" "unicode-case" "unicode-gencat" "unicode-perl" "unicode-script" "unicode-segment" ]; }; - "regex-automata 0.1.10" = rec { - crateName = "regex-automata"; - version = "0.1.10"; - edition = "2015"; - sha256 = "0ci1hvbzhrfby5fdpf4ganhf7kla58acad9i1ff1p34dzdrhs8vc"; - libName = "regex_automata"; - authors = [ - "Andrew Gallant " - ]; - dependencies = [ - { - name = "regex-syntax"; - packageId = "regex-syntax 0.6.29"; - optional = true; - } - ]; - features = { - "default" = [ "std" ]; - "fst" = [ "dep:fst" ]; - "regex-syntax" = [ "dep:regex-syntax" ]; - "std" = [ "regex-syntax" ]; - "transducer" = [ "std" "fst" ]; - }; - resolvedDefaultFeatures = [ "default" "regex-syntax" "std" ]; - }; - "regex-automata 0.4.9" = rec { + "regex-automata" = rec { crateName = "regex-automata"; version = "0.4.9"; edition = "2021"; @@ -7260,7 +7226,7 @@ rec { } { name = "regex-syntax"; - packageId = "regex-syntax 0.8.5"; + packageId = "regex-syntax"; optional = true; usesDefaultFeatures = false; } @@ -7296,22 +7262,7 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "dfa" "dfa-build" "dfa-onepass" "dfa-search" "hybrid" "meta" "nfa" "nfa-backtrack" "nfa-pikevm" "nfa-thompson" "perf" "perf-inline" "perf-literal" "perf-literal-multisubstring" "perf-literal-substring" "std" "syntax" "unicode" "unicode-age" "unicode-bool" "unicode-case" "unicode-gencat" "unicode-perl" "unicode-script" "unicode-segment" "unicode-word-boundary" ]; }; - "regex-syntax 0.6.29" = rec { - crateName = "regex-syntax"; - version = "0.6.29"; - edition = "2018"; - sha256 = "1qgj49vm6y3zn1hi09x91jvgkl2b1fiaq402skj83280ggfwcqpi"; - libName = "regex_syntax"; - authors = [ - "The Rust Project Developers" - ]; - features = { - "default" = [ "unicode" ]; - "unicode" = [ "unicode-age" "unicode-bool" "unicode-case" "unicode-gencat" "unicode-perl" "unicode-script" "unicode-segment" ]; - }; - resolvedDefaultFeatures = [ "default" "unicode" "unicode-age" "unicode-bool" "unicode-case" "unicode-gencat" "unicode-perl" "unicode-script" "unicode-segment" ]; - }; - "regex-syntax 0.8.5" = rec { + "regex-syntax" = rec { crateName = "regex-syntax"; version = "0.8.5"; edition = "2021"; @@ -11342,9 +11293,9 @@ rec { }; "tracing-subscriber" = rec { crateName = "tracing-subscriber"; - version = "0.3.19"; + version = "0.3.20"; edition = "2018"; - sha256 = "0220rignck8072i89jjsh140vmh14ydwpdwnifyaf3xcnpn9s678"; + sha256 = "1m9447bxq7236avgl6n5yb2aqwplrghm61dgipw03mh7ad7s2m10"; libName = "tracing_subscriber"; authors = [ "Eliza Weisman " @@ -11368,11 +11319,11 @@ rec { optional = true; } { - name = "regex"; - packageId = "regex"; + name = "regex-automata"; + packageId = "regex-automata"; optional = true; usesDefaultFeatures = false; - features = [ "std" "unicode-case" "unicode-perl" ]; + features = [ "std" ]; } { name = "serde"; @@ -11424,12 +11375,6 @@ rec { } ]; devDependencies = [ - { - name = "regex"; - packageId = "regex"; - usesDefaultFeatures = false; - features = [ "std" ]; - } { name = "tracing"; packageId = "tracing"; @@ -11443,7 +11388,7 @@ rec { "ansi" = [ "fmt" "nu-ansi-term" ]; "chrono" = [ "dep:chrono" ]; "default" = [ "smallvec" "fmt" "ansi" "tracing-log" "std" ]; - "env-filter" = [ "matchers" "regex" "once_cell" "tracing" "std" "thread_local" ]; + "env-filter" = [ "matchers" "once_cell" "tracing" "std" "thread_local" "dep:regex-automata" ]; "fmt" = [ "registry" "std" ]; "json" = [ "tracing-serde" "serde" "serde_json" ]; "local-time" = [ "time/local-offset" ]; @@ -11451,7 +11396,6 @@ rec { "nu-ansi-term" = [ "dep:nu-ansi-term" ]; "once_cell" = [ "dep:once_cell" ]; "parking_lot" = [ "dep:parking_lot" ]; - "regex" = [ "dep:regex" ]; "registry" = [ "sharded-slab" "thread_local" "std" ]; "serde" = [ "dep:serde" ]; "serde_json" = [ "dep:serde_json" ]; @@ -11467,7 +11411,7 @@ rec { "valuable-serde" = [ "dep:valuable-serde" ]; "valuable_crate" = [ "dep:valuable_crate" ]; }; - resolvedDefaultFeatures = [ "alloc" "ansi" "default" "env-filter" "fmt" "json" "matchers" "nu-ansi-term" "once_cell" "regex" "registry" "serde" "serde_json" "sharded-slab" "smallvec" "std" "thread_local" "tracing" "tracing-log" "tracing-serde" ]; + resolvedDefaultFeatures = [ "alloc" "ansi" "default" "env-filter" "fmt" "json" "matchers" "nu-ansi-term" "once_cell" "registry" "serde" "serde_json" "sharded-slab" "smallvec" "std" "thread_local" "tracing" "tracing-log" "tracing-serde" ]; }; "try-lock" = rec { crateName = "try-lock"; @@ -12477,42 +12421,6 @@ rec { "serde" = [ "dep:serde" ]; }; }; - "winapi" = rec { - crateName = "winapi"; - version = "0.3.9"; - edition = "2015"; - sha256 = "06gl025x418lchw1wxj64ycr7gha83m44cjr5sarhynd9xkrm0sw"; - authors = [ - "Peter Atashian " - ]; - dependencies = [ - { - name = "winapi-i686-pc-windows-gnu"; - packageId = "winapi-i686-pc-windows-gnu"; - target = { target, features }: (target.name == "i686-pc-windows-gnu"); - } - { - name = "winapi-x86_64-pc-windows-gnu"; - packageId = "winapi-x86_64-pc-windows-gnu"; - target = { target, features }: (target.name == "x86_64-pc-windows-gnu"); - } - ]; - features = { - "debug" = [ "impl-debug" ]; - }; - resolvedDefaultFeatures = [ "consoleapi" "errhandlingapi" "fileapi" "handleapi" "processenv" ]; - }; - "winapi-i686-pc-windows-gnu" = rec { - crateName = "winapi-i686-pc-windows-gnu"; - version = "0.4.0"; - edition = "2015"; - sha256 = "1dmpa6mvcvzz16zg6d5vrfy4bxgg541wxrcip7cnshi06v38ffxc"; - libName = "winapi_i686_pc_windows_gnu"; - authors = [ - "Peter Atashian " - ]; - - }; "winapi-util" = rec { crateName = "winapi-util"; version = "0.1.10"; @@ -12531,17 +12439,6 @@ rec { } ]; - }; - "winapi-x86_64-pc-windows-gnu" = rec { - crateName = "winapi-x86_64-pc-windows-gnu"; - version = "0.4.0"; - edition = "2015"; - sha256 = "0gqq64czqb64kskjryj8isp62m2sgvx25yyj3kpc2myh85w24bki"; - libName = "winapi_x86_64_pc_windows_gnu"; - authors = [ - "Peter Atashian " - ]; - }; "windows-core" = rec { crateName = "windows-core"; @@ -12944,7 +12841,7 @@ rec { "Win32_Web" = [ "Win32" ]; "Win32_Web_InternetExplorer" = [ "Win32_Web" ]; }; - resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_System" "Win32_System_Threading" "default" ]; + resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_Security" "Win32_Storage" "Win32_Storage_FileSystem" "Win32_System" "Win32_System_Console" "Win32_System_Threading" "default" ]; }; "windows-sys 0.59.0" = rec { crateName = "windows-sys";