diff --git a/pkgs/development/python-modules/ruff-lsp/default.nix b/pkgs/development/python-modules/ruff-lsp/default.nix index b30df5bc38a1..7d0d3fcbd5ce 100644 --- a/pkgs/development/python-modules/ruff-lsp/default.nix +++ b/pkgs/development/python-modules/ruff-lsp/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "ruff-lsp"; - version = "0.0.32"; + version = "0.0.34"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit version; pname = "ruff_lsp"; - hash = "sha256-n69Ibm+SFpjEkwPoYAJxVmmgtrRhzWh0PLfRe+iLxdo="; + hash = "sha256-8zbKP9Taeh9O5ptJoRYDtVm0QSeMtTA7ppEpjXcoDCY="; }; postPatch = '' @@ -60,6 +60,6 @@ buildPythonPackage rec { homepage = "https://github.com/astral-sh/ruff-lsp"; changelog = "https://github.com/astral-sh/ruff-lsp/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ kalekseev ]; + maintainers = with maintainers; [ figsoda kalekseev ]; }; } diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock index 89efc25897a1..5991cd08ad6e 100644 --- a/pkgs/development/tools/ruff/Cargo.lock +++ b/pkgs/development/tools/ruff/Cargo.lock @@ -171,6 +171,12 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" + [[package]] name = "bincode" version = "1.3.3" @@ -256,7 +262,8 @@ dependencies = [ "iana-time-zone", "js-sys", "num-traits", - "time", + "serde", + "time 0.1.45", "wasm-bindgen", "winapi", ] @@ -555,6 +562,41 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "darling" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.18", +] + +[[package]] +name = "darling_macro" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.18", +] + [[package]] name = "diff" version = "0.1.13" @@ -691,7 +733,7 @@ dependencies = [ [[package]] name = "flake8-to-ruff" -version = "0.0.272" +version = "0.0.273" dependencies = [ "anyhow", "clap", @@ -814,6 +856,12 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + [[package]] name = "hexf-parse" version = "0.2.1" @@ -843,6 +891,12 @@ dependencies = [ "cc", ] +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "0.3.0" @@ -1402,6 +1456,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" dependencies = [ + "phf_macros", "phf_shared", ] @@ -1425,6 +1480,19 @@ dependencies = [ "rand", ] +[[package]] +name = "phf_macros" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "phf_shared" version = "0.11.1" @@ -1725,7 +1793,7 @@ dependencies = [ [[package]] name = "ruff" -version = "0.0.272" +version = "0.0.273" dependencies = [ "annotate-snippets 0.9.1", "anyhow", @@ -1752,6 +1820,7 @@ dependencies = [ "path-absolutize", "pathdiff", "pep440_rs", + "phf", "pretty_assertions", "pyproject-toml", "quick-junit", @@ -1760,10 +1829,10 @@ dependencies = [ "ruff_cache", "ruff_diagnostics", "ruff_macros", - "ruff_newlines", "ruff_python_ast", "ruff_python_semantic", "ruff_python_stdlib", + "ruff_python_whitespace", "ruff_rustpython", "ruff_text_size", "ruff_textwrap", @@ -1774,6 +1843,7 @@ dependencies = [ "semver", "serde", "serde_json", + "serde_with", "shellexpand", "similar", "smallvec", @@ -1810,6 +1880,7 @@ name = "ruff_cache" version = "0.0.0" dependencies = [ "filetime", + "glob", "globset", "itertools", "regex", @@ -1818,7 +1889,7 @@ dependencies = [ [[package]] name = "ruff_cli" -version = "0.0.272" +version = "0.0.273" dependencies = [ "annotate-snippets 0.9.1", "anyhow", @@ -1837,6 +1908,7 @@ dependencies = [ "glob", "ignore", "itertools", + "itoa", "log", "mimalloc", "notify", @@ -1871,17 +1943,20 @@ dependencies = [ "clap", "itertools", "libcst", + "log", "once_cell", "pretty_assertions", "regex", "ruff", "ruff_cli", "ruff_diagnostics", + "ruff_python_formatter", "ruff_textwrap", "rustpython-format", "rustpython-parser", "schemars", "serde_json", + "similar", "strum", "strum_macros", ] @@ -1930,14 +2005,6 @@ dependencies = [ "syn 2.0.18", ] -[[package]] -name = "ruff_newlines" -version = "0.0.0" -dependencies = [ - "memchr", - "ruff_text_size", -] - [[package]] name = "ruff_python_ast" version = "0.0.0" @@ -1952,7 +2019,7 @@ dependencies = [ "num-bigint", "num-traits", "once_cell", - "ruff_newlines", + "ruff_python_whitespace", "ruff_text_size", "rustc-hash", "rustpython-ast", @@ -1974,8 +2041,8 @@ dependencies = [ "itertools", "once_cell", "ruff_formatter", - "ruff_newlines", "ruff_python_ast", + "ruff_python_whitespace", "ruff_testing_macros", "ruff_text_size", "rustc-hash", @@ -2009,6 +2076,14 @@ dependencies = [ "rustc-hash", ] +[[package]] +name = "ruff_python_whitespace" +version = "0.0.0" +dependencies = [ + "memchr", + "ruff_text_size", +] + [[package]] name = "ruff_rustpython" version = "0.0.0" @@ -2030,7 +2105,7 @@ dependencies = [ [[package]] name = "ruff_text_size" version = "0.0.0" -source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd#7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd" +source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=ed3b4eb72b6e497bbdb4d19dec6621074d724130#ed3b4eb72b6e497bbdb4d19dec6621074d724130" dependencies = [ "schemars", "serde", @@ -2040,7 +2115,7 @@ dependencies = [ name = "ruff_textwrap" version = "0.0.0" dependencies = [ - "ruff_newlines", + "ruff_python_whitespace", "ruff_text_size", ] @@ -2108,7 +2183,7 @@ dependencies = [ [[package]] name = "rustpython-ast" version = "0.2.0" -source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd#7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd" +source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=ed3b4eb72b6e497bbdb4d19dec6621074d724130#ed3b4eb72b6e497bbdb4d19dec6621074d724130" dependencies = [ "is-macro", "num-bigint", @@ -2119,7 +2194,7 @@ dependencies = [ [[package]] name = "rustpython-format" version = "0.2.0" -source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd#7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd" +source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=ed3b4eb72b6e497bbdb4d19dec6621074d724130#ed3b4eb72b6e497bbdb4d19dec6621074d724130" dependencies = [ "bitflags 2.3.1", "itertools", @@ -2131,7 +2206,7 @@ dependencies = [ [[package]] name = "rustpython-literal" version = "0.2.0" -source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd#7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd" +source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=ed3b4eb72b6e497bbdb4d19dec6621074d724130#ed3b4eb72b6e497bbdb4d19dec6621074d724130" dependencies = [ "hexf-parse", "is-macro", @@ -2143,7 +2218,7 @@ dependencies = [ [[package]] name = "rustpython-parser" version = "0.2.0" -source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd#7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd" +source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=ed3b4eb72b6e497bbdb4d19dec6621074d724130#ed3b4eb72b6e497bbdb4d19dec6621074d724130" dependencies = [ "anyhow", "is-macro", @@ -2166,9 +2241,10 @@ dependencies = [ [[package]] name = "rustpython-parser-core" version = "0.2.0" -source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd#7a3eedbf6fb4ea7068a1bf7fe0e97e963ea95ffd" +source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=ed3b4eb72b6e497bbdb4d19dec6621074d724130#ed3b4eb72b6e497bbdb4d19dec6621074d724130" dependencies = [ "is-macro", + "memchr", "ruff_text_size", ] @@ -2293,7 +2369,6 @@ version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ - "indexmap", "itoa", "ryu", "serde", @@ -2308,6 +2383,34 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_with" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f02d8aa6e3c385bf084924f660ce2a3a6bd333ba55b35e8590b321f35d88513" +dependencies = [ + "base64 0.21.2", + "chrono", + "hex", + "indexmap", + "serde", + "serde_json", + "serde_with_macros", + "time 0.3.21", +] + +[[package]] +name = "serde_with_macros" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edc7d5d3932fb12ce722ee5e64dd38c504efba37567f0c402f6ca728c3b8b070" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.18", +] + [[package]] name = "shellexpand" version = "3.1.0" @@ -2534,6 +2637,33 @@ dependencies = [ "winapi", ] +[[package]] +name = "time" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" +dependencies = [ + "itoa", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + +[[package]] +name = "time-macros" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +dependencies = [ + "time-core", +] + [[package]] name = "tiny-keccak" version = "2.0.2" @@ -2752,7 +2882,7 @@ version = "2.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "338b31dd1314f68f3aabf3ed57ab922df95ffcd902476ca7ba3c4ce7b908c46d" dependencies = [ - "base64", + "base64 0.13.1", "flate2", "log", "once_cell", diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index c14375db2fc1..0029a10a83aa 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -10,20 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.272"; + version = "0.0.273"; src = fetchFromGitHub { owner = "astral-sh"; repo = pname; rev = "v${version}"; - hash = "sha256-B4wZTKC1Z6OxXQHrG9Q9VjY6ZnA3FOoMMNfroe+1A7I="; + hash = "sha256-FZWCA4oEUe7hOodtVypvqXv4REXCAEgY0s6wQSKDWuI="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "libcst-0.1.0" = "sha256-jG9jYJP4reACkFLrQBWOYH6nbKniNyFVItD0cTZ+nW0="; - "ruff_text_size-0.0.0" = "sha256-5CjNHj5Rz51HwLyXtUKJHmEKkAC183oafdqKDem69oc="; + "ruff_text_size-0.0.0" = "sha256-FdbyiuJorhqI5v6FovLk0JXBfbgcOvHKybqZynBimt0="; "unicode_names2-0.6.0" = "sha256-eWg9+ISm/vztB0KIdjhq5il2ZnwGJQCleCYfznCI3Wg="; }; };