diff options
| author | Gaetan Lepage <gaetan@glepage.com> | 2024-08-02 19:10:56 +0200 |
|---|---|---|
| committer | Gaetan Lepage <gaetan@glepage.com> | 2024-08-02 22:41:16 +0200 |
| commit | c7962597fece3e65e4200c5367da58467e8fed9e (patch) | |
| tree | 35abf1b1a23956283ccbb11dd476c60d9d18547e | |
| parent | Merge pull request #319807 from hellodword/nixos-restic-add-unlock (diff) | |
| download | nixpkgs-origin/ruff.tar.gz | |
ruff: 0.5.5 -> 0.5.6origin/ruff
Diff: https://github.com/astral-sh/ruff/compare/refs/tags/0.5.5...0.5.6
Changelog: https://github.com/astral-sh/ruff/releases/tag/0.5.6
| -rw-r--r-- | pkgs/development/tools/ruff/Cargo.lock | 214 | ||||
| -rw-r--r-- | pkgs/development/tools/ruff/default.nix | 9 |
2 files changed, 176 insertions, 47 deletions
diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock index c072bcac5584..6f4fe43f9a43 100644 --- a/pkgs/development/tools/ruff/Cargo.lock +++ b/pkgs/development/tools/ruff/Cargo.lock @@ -141,9 +141,9 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "argfile" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c5c8e418080ef8aa932039d12eda7b6f5043baf48f1523c166fbc32d004534" +checksum = "0a1cc0ba69de57db40674c66f7cf2caee3981ddef084388482c95c0e2133e5e8" dependencies = [ "fs-err", "os_str_bytes", @@ -189,10 +189,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] +name = "boomphf" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617e2d952880a00583ddb9237ac3965732e8df6a92a8e7bcc054100ec467ec3b" +dependencies = [ + "crossbeam-utils", + "log", + "rayon", + "wyhash", +] + +[[package]] name = "bstr" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", "regex-automata 0.4.6", @@ -314,9 +326,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.9" +version = "4.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" +checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3" dependencies = [ "clap_builder", "clap_derive", @@ -324,9 +336,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.9" +version = "4.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" +checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa" dependencies = [ "anstream", "anstyle", @@ -367,9 +379,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.8" +version = "4.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" +checksum = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e" dependencies = [ "heck", "proc-macro2", @@ -759,9 +771,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -930,9 +942,9 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.8.4" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" dependencies = [ "hashbrown", ] @@ -1021,9 +1033,9 @@ dependencies = [ [[package]] name = "imara-diff" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af13c8ceb376860ff0c6a66d83a8cdd4ecd9e464da24621bbffcd02b49619434" +checksum = "fc9da1a252bd44cd341657203722352efc9bc0c847d06ea6d2dc1cd1135e0a01" dependencies = [ "ahash", "hashbrown", @@ -1031,9 +1043,9 @@ dependencies = [ [[package]] name = "imperative" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b70798296d538cdaa6d652941fcc795963f8b9878b9e300c9fab7a522bd2fc0" +checksum = "29a1f6526af721f9aec9ceed7ab8ebfca47f3399d08b80056c2acca3fcb694a9" dependencies = [ "phf", "rust-stemmers", @@ -1526,10 +1538,84 @@ dependencies = [ ] [[package]] +name = "orx-concurrent-ordered-bag" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa866e2be4aa03927eddb481e7c479d5109fe3121324fb7db6d97f91adf9876" +dependencies = [ + "orx-fixed-vec", + "orx-pinned-concurrent-col", + "orx-pinned-vec", + "orx-pseudo-default", + "orx-split-vec", +] + +[[package]] +name = "orx-concurrent-vec" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5912426ffb660f8b61e8f0812a1d07400803cd5513969d2c7af4d69602ba8a1" +dependencies = [ + "orx-concurrent-ordered-bag", + "orx-fixed-vec", + "orx-pinned-concurrent-col", + "orx-pinned-vec", + "orx-pseudo-default", + "orx-split-vec", +] + +[[package]] +name = "orx-fixed-vec" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f69466c7c1fc2e1f00b58e39059b78c438b9fad144d1937ef177ecfc413e997" +dependencies = [ + "orx-pinned-vec", + "orx-pseudo-default", +] + +[[package]] +name = "orx-pinned-concurrent-col" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdbcb1fa05dc1676f1c9cf19f443b3d2d2ca5835911477d22fa77cad8b79208d" +dependencies = [ + "orx-fixed-vec", + "orx-pinned-vec", + "orx-pseudo-default", + "orx-split-vec", +] + +[[package]] +name = "orx-pinned-vec" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1071baf586de45722668234bddf56c52c1ece6a6153d16541bbb0505f0ac055" +dependencies = [ + "orx-pseudo-default", +] + +[[package]] +name = "orx-pseudo-default" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2f627c439e723fa78e410a0faba89047a8a47d0dc013da5c0e05806e8a6cddb" + +[[package]] +name = "orx-split-vec" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52b9dbfa8c7069ae73a890870d3aa9097a897d616751d3d0278f2b42d5214730" +dependencies = [ + "orx-pinned-vec", + "orx-pseudo-default", +] + +[[package]] name = "os_str_bytes" -version = "6.6.1" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" +checksum = "7ac44c994af577c799b1b4bd80dc214701e349873ad894d6cdf96f4f7526e0b9" dependencies = [ "memchr", ] @@ -1858,13 +1944,11 @@ dependencies = [ "countme", "crossbeam", "ctrlc", - "notify", + "filetime", "rayon", "red_knot_module_resolver", - "red_knot_python_semantic", + "red_knot_workspace", "ruff_db", - "ruff_python_ast", - "rustc-hash 2.0.0", "salsa", "tempfile", "tracing", @@ -1913,6 +1997,22 @@ dependencies = [ ] [[package]] +name = "red_knot_workspace" +version = "0.0.0" +dependencies = [ + "anyhow", + "crossbeam", + "notify", + "red_knot_module_resolver", + "red_knot_python_semantic", + "ruff_db", + "ruff_python_ast", + "rustc-hash 2.0.0", + "salsa", + "tracing", +] + +[[package]] name = "redox_syscall" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1993,7 +2093,7 @@ dependencies = [ [[package]] name = "ruff" -version = "0.5.5" +version = "0.5.6" dependencies = [ "anyhow", "argfile", @@ -2048,10 +2148,9 @@ name = "ruff_benchmark" version = "0.0.0" dependencies = [ "codspeed-criterion-compat", - "criterion", "mimalloc", "once_cell", - "red_knot", + "red_knot_workspace", "ruff_db", "ruff_linter", "ruff_python_ast", @@ -2088,6 +2187,8 @@ dependencies = [ "filetime", "ignore", "insta", + "matchit", + "path-slash", "ruff_cache", "ruff_notebook", "ruff_python_ast", @@ -2178,7 +2279,7 @@ dependencies = [ [[package]] name = "ruff_linter" -version = "0.5.5" +version = "0.5.6" dependencies = [ "aho-corasick", "annotate-snippets 0.9.2", @@ -2232,6 +2333,7 @@ dependencies = [ "thiserror", "toml", "typed-arena", + "unicode-normalization", "unicode-width", "unicode_names2", "url", @@ -2401,13 +2503,17 @@ version = "0.0.0" dependencies = [ "bitflags 2.6.0", "is-macro", + "ruff_cache", "ruff_index", + "ruff_macros", "ruff_python_ast", "ruff_python_parser", "ruff_python_stdlib", "ruff_source_file", "ruff_text_size", "rustc-hash 2.0.0", + "schemars", + "serde", ] [[package]] @@ -2493,7 +2599,7 @@ dependencies = [ [[package]] name = "ruff_wasm" -version = "0.5.5" +version = "0.5.6" dependencies = [ "console_error_panic_hook", "console_log", @@ -2540,6 +2646,7 @@ dependencies = [ "ruff_macros", "ruff_python_ast", "ruff_python_formatter", + "ruff_python_semantic", "ruff_source_file", "rustc-hash 2.0.0", "schemars", @@ -2632,25 +2739,34 @@ checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "salsa" version = "0.18.0" -source = "git+https://github.com/salsa-rs/salsa.git?rev=a1bf3a613f451af7fc0a59411c56abc47fe8e8e1#a1bf3a613f451af7fc0a59411c56abc47fe8e8e1" +source = "git+https://github.com/MichaReiser/salsa.git?rev=0cae5c52a3240172ef0be5c9d19e63448c53397c#0cae5c52a3240172ef0be5c9d19e63448c53397c" dependencies = [ "arc-swap", + "boomphf", "crossbeam", - "dashmap 5.5.3", + "dashmap 6.0.1", "hashlink", "indexmap", - "log", + "orx-concurrent-vec", "parking_lot", - "rustc-hash 1.1.0", + "rustc-hash 2.0.0", + "salsa-macro-rules", "salsa-macros", "smallvec", + "tracing", ] [[package]] +name = "salsa-macro-rules" +version = "0.1.0" +source = "git+https://github.com/MichaReiser/salsa.git?rev=0cae5c52a3240172ef0be5c9d19e63448c53397c#0cae5c52a3240172ef0be5c9d19e63448c53397c" + +[[package]] name = "salsa-macros" version = "0.18.0" -source = "git+https://github.com/salsa-rs/salsa.git?rev=a1bf3a613f451af7fc0a59411c56abc47fe8e8e1#a1bf3a613f451af7fc0a59411c56abc47fe8e8e1" +source = "git+https://github.com/MichaReiser/salsa.git?rev=0cae5c52a3240172ef0be5c9d19e63448c53397c#0cae5c52a3240172ef0be5c9d19e63448c53397c" dependencies = [ + "heck", "proc-macro2", "quote", "syn", @@ -2752,11 +2868,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -2774,9 +2891,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -3077,9 +3194,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" +checksum = "81967dd0dd2c1ab0bc3468bd7caecc32b8a4aa47d0c8c695d8c2b2108168d62c" dependencies = [ "serde", "serde_spanned", @@ -3089,18 +3206,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "f8fb9f64314842840f1d940ac544da178732128f1c78c21772e876579e0da1db" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.16" +version = "0.22.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" +checksum = "8d9f8729f5aea9562aac1cc0441f5d6de3cff1ee0c5d67293eeca5eb36ee7c16" dependencies = [ "indexmap", "serde", @@ -3748,6 +3865,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" [[package]] +name = "wyhash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf6e163c25e3fac820b4b453185ea2dea3b6a3e0a721d4d23d75bd33734c295" +dependencies = [ + "rand_core", +] + +[[package]] name = "yansi" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 499c3c8819c2..03146b089d8c 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -13,20 +13,20 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/${version}"; - hash = "sha256-dqfK6YdAV4cdUYB8bPE9I5FduBJ90RxUA7TMvcVq6Zw="; + hash = "sha256-70EEdr6gjdE8kjgMXYzHpqCzt4E73/Gr7ksNEbLlBoA="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "lsp-types-0.95.1" = "sha256-8Oh299exWXVi6A39pALOISNfp8XBya8z+KT/Z7suRxQ="; - "salsa-0.18.0" = "sha256-gcaAsrrJXrWOIHUnfBwwuTBG1Mb+lUEmIxSGIVLhXaM="; + "salsa-0.18.0" = "sha256-y5PuGeQNUHLhU8YY9wPbGk71eNZ0aM0Xpvwfyf+UZwM="; }; }; @@ -64,12 +64,15 @@ rustPlatform.buildRustPackage rec { "--skip=directory_moved_to_trash" "--skip=directory_moved_to_workspace" "--skip=directory_renamed" + "--skip=hard_links_in_workspace" + "--skip=hard_links_to_target_outside_workspace" "--skip=move_file_to_trash" "--skip=move_file_to_workspace" "--skip=new_file" "--skip=new_ignored_file" "--skip=rename_file" "--skip=search_path" + "--skip=unix::symlink_inside_workspace" ]; meta = { |
