diff --git a/pkgs/by-name/ru/ruff/Cargo.lock b/pkgs/by-name/ru/ruff/Cargo.lock index 37259f408fd0..dadfc5b6b472 100644 --- a/pkgs/by-name/ru/ruff/Cargo.lock +++ b/pkgs/by-name/ru/ruff/Cargo.lock @@ -225,7 +225,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", - "regex-automata 0.4.6", + "regex-automata 0.4.8", "serde", ] @@ -879,9 +879,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fern" @@ -994,8 +994,8 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -1114,7 +1114,7 @@ dependencies = [ "globset", "log", "memchr", - "regex-automata 0.4.6", + "regex-automata 0.4.8", "same-file", "walkdir", "winapi-util", @@ -1347,9 +1347,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libcst" @@ -1405,9 +1405,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" @@ -2084,6 +2084,7 @@ dependencies = [ "hashbrown", "insta", "ordermap", + "red_knot_vendored", "ruff_db", "ruff_index", "ruff_python_ast", @@ -2092,7 +2093,6 @@ dependencies = [ "ruff_python_stdlib", "ruff_source_file", "ruff_text_size", - "ruff_vendored", "rustc-hash 2.0.0", "salsa", "smallvec", @@ -2127,6 +2127,17 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "red_knot_vendored" +version = "0.0.0" +dependencies = [ + "once_cell", + "path-slash", + "ruff_db", + "walkdir", + "zip", +] + [[package]] name = "red_knot_wasm" version = "0.0.0" @@ -2152,11 +2163,11 @@ dependencies = [ "notify", "rayon", "red_knot_python_semantic", + "red_knot_vendored", "ruff_cache", "ruff_db", "ruff_python_ast", "ruff_text_size", - "ruff_vendored", "rustc-hash 2.0.0", "salsa", "tempfile", @@ -2194,14 +2205,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -2215,13 +2226,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax 0.8.5", ] [[package]] @@ -2232,9 +2243,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "ring" @@ -2253,7 +2264,7 @@ dependencies = [ [[package]] name = "ruff" -version = "0.6.8" +version = "0.6.9" dependencies = [ "anyhow", "argfile", @@ -2325,6 +2336,7 @@ dependencies = [ "ruff_python_formatter", "ruff_python_parser", "ruff_python_trivia", + "rustc-hash 2.0.0", "serde", "serde_json", "tikv-jemallocator", @@ -2472,7 +2484,7 @@ dependencies = [ [[package]] name = "ruff_linter" -version = "0.6.8" +version = "0.6.9" dependencies = [ "aho-corasick", "annotate-snippets 0.9.2", @@ -2790,20 +2802,9 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "ruff_vendored" -version = "0.0.0" -dependencies = [ - "once_cell", - "path-slash", - "ruff_db", - "walkdir", - "zip", -] - [[package]] name = "ruff_wasm" -version = "0.6.8" +version = "0.6.9" dependencies = [ "console_error_panic_hook", "console_log", @@ -2886,9 +2887,9 @@ checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -3245,9 +3246,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "2.0.77" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -3267,9 +3268,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand", diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index e1c08aa56074..c760ebd8f336 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -8,19 +8,18 @@ rust-jemalloc-sys, ruff-lsp, nix-update-script, - testers, - ruff, + versionCheckHook, }: rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.6.8"; + version = "0.6.9"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/${version}"; - hash = "sha256-guRg35waq6w+P8eaXJFwMtROoXU3d3yURGwzG2SIzhc="; + hash = "sha256-O8iRCVxHrchBSf9kLdkdT0+oMi+5fLCAF9CMEsPrHqw="; }; cargoLock = { @@ -44,10 +43,11 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/ruff generate-shell-completion zsh) ''; - passthru.tests = { - inherit ruff-lsp; + passthru = { + tests = { + inherit ruff-lsp; + }; updateScript = nix-update-script { }; - version = testers.testVersion { package = ruff; }; }; # Failing on darwin for an unclear reason. @@ -73,6 +73,12 @@ rustPlatform.buildRustPackage rec { "--skip=unix::symlink_inside_workspace" ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + meta = { description = "Extremely fast Python linter"; homepage = "https://github.com/astral-sh/ruff";