diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock index 253340ecea4..136f7d53529 100644 --- a/pkgs/development/tools/ruff/Cargo.lock +++ b/pkgs/development/tools/ruff/Cargo.lock @@ -711,7 +711,7 @@ dependencies = [ [[package]] name = "flake8-to-ruff" -version = "0.0.269" +version = "0.0.270" dependencies = [ "anyhow", "clap 4.2.7", @@ -1723,7 +1723,7 @@ dependencies = [ [[package]] name = "ruff" -version = "0.0.269" +version = "0.0.270" dependencies = [ "annotate-snippets 0.9.1", "anyhow", @@ -1780,6 +1780,7 @@ dependencies = [ "toml", "typed-arena", "unicode-width", + "unicode_names2", ] [[package]] @@ -1812,7 +1813,7 @@ dependencies = [ [[package]] name = "ruff_cli" -version = "0.0.269" +version = "0.0.270" dependencies = [ "annotate-snippets 0.9.1", "anyhow", @@ -1899,10 +1900,19 @@ dependencies = [ "rustc-hash", "schemars", "serde", + "static_assertions", "tracing", "unicode-width", ] +[[package]] +name = "ruff_index" +version = "0.0.0" +dependencies = [ + "ruff_macros", + "static_assertions", +] + [[package]] name = "ruff_macros" version = "0.0.0" @@ -1927,9 +1937,9 @@ dependencies = [ "num-bigint", "num-traits", "once_cell", - "regex", "ruff_text_size", "rustc-hash", + "rustpython-ast", "rustpython-literal", "rustpython-parser", "serde", @@ -1964,6 +1974,7 @@ dependencies = [ "bitflags 2.3.1", "is-macro", "nohash-hasher", + "ruff_index", "ruff_python_ast", "ruff_python_stdlib", "ruff_text_size", @@ -2001,7 +2012,7 @@ dependencies = [ [[package]] name = "ruff_text_size" version = "0.0.0" -source = "git+https://github.com/RustPython/Parser.git?rev=3654cf0bdfc270df6b2b83e2df086843574ad082#3654cf0bdfc270df6b2b83e2df086843574ad082" +source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=335780aeeac1e6fcd85994ba001d7b8ce99fcf65#335780aeeac1e6fcd85994ba001d7b8ce99fcf65" dependencies = [ "schemars", "serde", @@ -2072,7 +2083,7 @@ dependencies = [ [[package]] name = "rustpython-ast" version = "0.2.0" -source = "git+https://github.com/RustPython/Parser.git?rev=3654cf0bdfc270df6b2b83e2df086843574ad082#3654cf0bdfc270df6b2b83e2df086843574ad082" +source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=335780aeeac1e6fcd85994ba001d7b8ce99fcf65#335780aeeac1e6fcd85994ba001d7b8ce99fcf65" dependencies = [ "is-macro", "num-bigint", @@ -2083,7 +2094,7 @@ dependencies = [ [[package]] name = "rustpython-format" version = "0.2.0" -source = "git+https://github.com/RustPython/Parser.git?rev=3654cf0bdfc270df6b2b83e2df086843574ad082#3654cf0bdfc270df6b2b83e2df086843574ad082" +source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=335780aeeac1e6fcd85994ba001d7b8ce99fcf65#335780aeeac1e6fcd85994ba001d7b8ce99fcf65" dependencies = [ "bitflags 2.3.1", "itertools", @@ -2095,7 +2106,7 @@ dependencies = [ [[package]] name = "rustpython-literal" version = "0.2.0" -source = "git+https://github.com/RustPython/Parser.git?rev=3654cf0bdfc270df6b2b83e2df086843574ad082#3654cf0bdfc270df6b2b83e2df086843574ad082" +source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=335780aeeac1e6fcd85994ba001d7b8ce99fcf65#335780aeeac1e6fcd85994ba001d7b8ce99fcf65" dependencies = [ "hexf-parse", "is-macro", @@ -2107,7 +2118,7 @@ dependencies = [ [[package]] name = "rustpython-parser" version = "0.2.0" -source = "git+https://github.com/RustPython/Parser.git?rev=3654cf0bdfc270df6b2b83e2df086843574ad082#3654cf0bdfc270df6b2b83e2df086843574ad082" +source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=335780aeeac1e6fcd85994ba001d7b8ce99fcf65#335780aeeac1e6fcd85994ba001d7b8ce99fcf65" dependencies = [ "anyhow", "is-macro", @@ -2130,7 +2141,7 @@ dependencies = [ [[package]] name = "rustpython-parser-core" version = "0.2.0" -source = "git+https://github.com/RustPython/Parser.git?rev=3654cf0bdfc270df6b2b83e2df086843574ad082#3654cf0bdfc270df6b2b83e2df086843574ad082" +source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=335780aeeac1e6fcd85994ba001d7b8ce99fcf65#335780aeeac1e6fcd85994ba001d7b8ce99fcf65" dependencies = [ "is-macro", "ruff_text_size", diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 7e8823fb163..4efc2e47fdb 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.269"; + version = "0.0.270"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - hash = "sha256-3W5nCtZJ1ej96c4BEbI7OPfxxyIyp7anWD1zhJqG0OE="; + hash = "sha256-rruNNP/VkvMQexQ+V/ASxl5flHt00YomMAVzW+eWp20="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "libcst-0.1.0" = "sha256-jG9jYJP4reACkFLrQBWOYH6nbKniNyFVItD0cTZ+nW0="; - "ruff_text_size-0.0.0" = "sha256-mfD5RXRCaRfnV7RZrN88rTPkSZ3ITNLTRtCuos14hwE="; + "ruff_text_size-0.0.0" = "sha256-hiM4+YAb0UUt8mUoKhMqTAiR3hCyoRMyEDe6di6Ohrc="; "unicode_names2-0.6.0" = "sha256-eWg9+ISm/vztB0KIdjhq5il2ZnwGJQCleCYfznCI3Wg="; }; };