From 5f471ee6b5ac2de9734a93af96d43910a67bf925 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 22 Sep 2023 14:27:24 -0400 Subject: [PATCH 1/2] ruff: 0.0.290 -> 0.0.291 Diff: https://github.com/astral-sh/ruff/compare/v0.0.290...v0.0.291 Changelog: https://github.com/astral-sh/ruff/releases/tag/v0.0.291 --- pkgs/development/tools/ruff/Cargo.lock | 518 ++++++++++++------------ pkgs/development/tools/ruff/default.nix | 4 +- 2 files changed, 268 insertions(+), 254 deletions(-) diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock index 488aaa2df9e..f111595ad2a 100644 --- a/pkgs/development/tools/ruff/Cargo.lock +++ b/pkgs/development/tools/ruff/Cargo.lock @@ -272,9 +272,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.30" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", @@ -313,9 +313,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.3" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84ed82781cea27b43c9b106a979fe450a13a31aab0500595fb3fc06616de08e6" +checksum = "b1d7b8d5ec32af0fadc644bf1fd509a688c2103b185644bb1e29d164e0703136" dependencies = [ "clap_builder", "clap_derive", @@ -323,9 +323,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.2" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56" dependencies = [ "anstream", "anstyle", @@ -383,7 +383,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.37", ] [[package]] @@ -516,7 +516,7 @@ dependencies = [ "clap", "criterion-plot", "is-terminal", - "itertools", + "itertools 0.10.5", "num-traits", "once_cell", "oorandom", @@ -535,7 +535,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ "cast", - "itertools", + "itertools 0.10.5", ] [[package]] @@ -608,7 +608,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.33", + "syn 2.0.37", ] [[package]] @@ -619,7 +619,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.33", + "syn 2.0.37", ] [[package]] @@ -810,19 +810,19 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flake8-to-ruff" -version = "0.0.290" +version = "0.0.291" dependencies = [ "anyhow", "clap", "colored", "configparser", - "itertools", + "itertools 0.11.0", "log", "once_cell", "pep440_rs", "pretty_assertions", "regex", - "ruff", + "ruff_linter", "ruff_workspace", "rustc-hash", "serde", @@ -1035,9 +1035,9 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.6" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" +checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" dependencies = [ "console", "instant", @@ -1049,9 +1049,9 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" [[package]] name = "inotify" @@ -1075,9 +1075,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.31.0" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0770b0a3d4c70567f0d58331f3088b0e4c4f56c9b8d764efe654b4a5d46de3a" +checksum = "a3e02c584f4595792d09509a94cdb92a3cef7592b1eb2d9877ee6f527062d0ea" dependencies = [ "console", "globset", @@ -1120,7 +1120,7 @@ dependencies = [ "pmutil 0.6.1", "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.37", ] [[package]] @@ -1143,6 +1143,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.9" @@ -1189,7 +1198,7 @@ dependencies = [ "diff", "ena", "is-terminal", - "itertools", + "itertools 0.10.5", "lalrpop-util", "petgraph", "regex", @@ -1475,16 +1484,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "number_prefix" version = "0.4.0" @@ -1720,7 +1719,7 @@ checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.37", ] [[package]] @@ -1749,7 +1748,7 @@ checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" dependencies = [ "anstyle", "difflib", - "itertools", + "itertools 0.10.5", "predicates-core", ] @@ -1889,9 +1888,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -1899,14 +1898,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -2020,8 +2017,177 @@ dependencies = [ ] [[package]] -name = "ruff" -version = "0.0.290" +name = "ruff_benchmark" +version = "0.0.0" +dependencies = [ + "codspeed-criterion-compat", + "criterion", + "mimalloc", + "once_cell", + "ruff_linter", + "ruff_python_ast", + "ruff_python_formatter", + "ruff_python_index", + "ruff_python_parser", + "serde", + "serde_json", + "tikv-jemallocator", + "ureq", + "url", +] + +[[package]] +name = "ruff_cache" +version = "0.0.0" +dependencies = [ + "filetime", + "glob", + "globset", + "itertools 0.11.0", + "regex", + "ruff_macros", + "seahash", +] + +[[package]] +name = "ruff_cli" +version = "0.0.291" +dependencies = [ + "annotate-snippets 0.9.1", + "anyhow", + "argfile", + "assert_cmd", + "bincode", + "bitflags 2.4.0", + "cachedir", + "chrono", + "clap", + "clap_complete_command", + "clearscreen", + "colored", + "filetime", + "glob", + "ignore", + "insta", + "insta-cmd", + "is-macro", + "itertools 0.11.0", + "itoa", + "log", + "mimalloc", + "notify", + "path-absolutize", + "rayon", + "regex", + "ruff_cache", + "ruff_diagnostics", + "ruff_formatter", + "ruff_linter", + "ruff_macros", + "ruff_notebook", + "ruff_python_ast", + "ruff_python_formatter", + "ruff_python_stdlib", + "ruff_python_trivia", + "ruff_source_file", + "ruff_text_size", + "ruff_workspace", + "rustc-hash", + "serde", + "serde_json", + "shellexpand", + "similar", + "strum", + "tempfile", + "test-case", + "thiserror", + "tikv-jemallocator", + "tracing", + "ureq", + "walkdir", + "wild", +] + +[[package]] +name = "ruff_dev" +version = "0.0.0" +dependencies = [ + "anyhow", + "clap", + "ignore", + "imara-diff", + "indicatif", + "indoc", + "itertools 0.11.0", + "libcst", + "once_cell", + "pretty_assertions", + "rayon", + "regex", + "ruff_cli", + "ruff_diagnostics", + "ruff_formatter", + "ruff_linter", + "ruff_notebook", + "ruff_python_ast", + "ruff_python_codegen", + "ruff_python_formatter", + "ruff_python_literal", + "ruff_python_parser", + "ruff_python_stdlib", + "ruff_python_trivia", + "ruff_workspace", + "schemars", + "serde", + "serde_json", + "similar", + "strum", + "strum_macros", + "tempfile", + "toml", + "tracing", + "tracing-indicatif", + "tracing-subscriber", +] + +[[package]] +name = "ruff_diagnostics" +version = "0.0.0" +dependencies = [ + "anyhow", + "log", + "ruff_text_size", + "serde", +] + +[[package]] +name = "ruff_formatter" +version = "0.0.0" +dependencies = [ + "drop_bomb", + "insta", + "ruff_cache", + "ruff_macros", + "ruff_text_size", + "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_linter" +version = "0.0.291" dependencies = [ "annotate-snippets 0.9.1", "anyhow", @@ -2035,7 +2201,7 @@ dependencies = [ "imperative", "insta", "is-macro", - "itertools", + "itertools 0.11.0", "libcst", "log", "memchr", @@ -2085,181 +2251,15 @@ dependencies = [ "wsl", ] -[[package]] -name = "ruff_benchmark" -version = "0.0.0" -dependencies = [ - "codspeed-criterion-compat", - "criterion", - "mimalloc", - "once_cell", - "ruff", - "ruff_python_ast", - "ruff_python_formatter", - "ruff_python_index", - "ruff_python_parser", - "serde", - "serde_json", - "tikv-jemallocator", - "ureq", - "url", -] - -[[package]] -name = "ruff_cache" -version = "0.0.0" -dependencies = [ - "filetime", - "glob", - "globset", - "itertools", - "regex", - "ruff_macros", -] - -[[package]] -name = "ruff_cli" -version = "0.0.290" -dependencies = [ - "annotate-snippets 0.9.1", - "anyhow", - "argfile", - "assert_cmd", - "bincode", - "bitflags 2.4.0", - "cachedir", - "chrono", - "clap", - "clap_complete_command", - "clearscreen", - "colored", - "filetime", - "glob", - "ignore", - "insta", - "insta-cmd", - "is-macro", - "itertools", - "itoa", - "log", - "mimalloc", - "notify", - "path-absolutize", - "rayon", - "regex", - "ruff", - "ruff_cache", - "ruff_diagnostics", - "ruff_formatter", - "ruff_macros", - "ruff_notebook", - "ruff_python_ast", - "ruff_python_formatter", - "ruff_python_stdlib", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", - "ruff_workspace", - "rustc-hash", - "serde", - "serde_json", - "shellexpand", - "similar", - "strum", - "tempfile", - "test-case", - "thiserror", - "tikv-jemallocator", - "tracing", - "ureq", - "walkdir", - "wild", -] - -[[package]] -name = "ruff_dev" -version = "0.0.0" -dependencies = [ - "anyhow", - "clap", - "ignore", - "imara-diff", - "indicatif", - "indoc", - "itertools", - "libcst", - "once_cell", - "pretty_assertions", - "rayon", - "regex", - "ruff", - "ruff_cli", - "ruff_diagnostics", - "ruff_formatter", - "ruff_notebook", - "ruff_python_ast", - "ruff_python_codegen", - "ruff_python_formatter", - "ruff_python_literal", - "ruff_python_parser", - "ruff_python_stdlib", - "ruff_python_trivia", - "ruff_workspace", - "schemars", - "serde", - "serde_json", - "similar", - "strum", - "strum_macros", - "tempfile", - "toml", - "tracing", - "tracing-indicatif", - "tracing-subscriber", -] - -[[package]] -name = "ruff_diagnostics" -version = "0.0.0" -dependencies = [ - "anyhow", - "log", - "ruff_text_size", - "serde", -] - -[[package]] -name = "ruff_formatter" -version = "0.0.0" -dependencies = [ - "drop_bomb", - "insta", - "ruff_text_size", - "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" dependencies = [ - "itertools", + "itertools 0.11.0", "proc-macro2", "quote", "ruff_python_trivia", - "syn 2.0.33", + "syn 2.0.37", ] [[package]] @@ -2268,7 +2268,7 @@ version = "0.0.0" dependencies = [ "anyhow", "insta", - "itertools", + "itertools 0.11.0", "once_cell", "ruff_diagnostics", "ruff_source_file", @@ -2288,7 +2288,7 @@ dependencies = [ "bitflags 2.4.0", "insta", "is-macro", - "itertools", + "itertools 0.11.0", "memchr", "num-bigint", "num-traits", @@ -2323,10 +2323,12 @@ dependencies = [ "clap", "countme", "insta", - "itertools", + "itertools 0.11.0", "memchr", "once_cell", + "ruff_cache", "ruff_formatter", + "ruff_macros", "ruff_python_ast", "ruff_python_index", "ruff_python_parser", @@ -2334,6 +2336,7 @@ dependencies = [ "ruff_source_file", "ruff_text_size", "rustc-hash", + "schemars", "serde", "serde_json", "similar", @@ -2348,7 +2351,7 @@ dependencies = [ name = "ruff_python_index" version = "0.0.0" dependencies = [ - "itertools", + "itertools 0.11.0", "ruff_python_ast", "ruff_python_parser", "ruff_python_trivia", @@ -2363,7 +2366,7 @@ dependencies = [ "bitflags 2.4.0", "hexf-parse", "is-macro", - "itertools", + "itertools 0.11.0", "lexical-parse-float", "num-traits", "rand", @@ -2377,7 +2380,7 @@ dependencies = [ "anyhow", "insta", "is-macro", - "itertools", + "itertools 0.11.0", "lalrpop", "lalrpop-util", "num-bigint", @@ -2430,12 +2433,11 @@ name = "ruff_python_trivia" version = "0.0.0" dependencies = [ "insta", - "memchr", + "itertools 0.11.0", "ruff_python_ast", "ruff_python_parser", "ruff_source_file", "ruff_text_size", - "smallvec", "unicode-ident", ] @@ -2484,14 +2486,15 @@ dependencies = [ "console_log", "js-sys", "log", - "ruff", "ruff_diagnostics", "ruff_formatter", + "ruff_linter", "ruff_python_ast", "ruff_python_codegen", "ruff_python_formatter", "ruff_python_index", "ruff_python_parser", + "ruff_python_trivia", "ruff_source_file", "ruff_text_size", "ruff_workspace", @@ -2511,14 +2514,19 @@ dependencies = [ "glob", "globset", "ignore", - "itertools", + "itertools 0.11.0", "log", + "once_cell", "path-absolutize", "pep440_rs", "regex", - "ruff", "ruff_cache", + "ruff_formatter", + "ruff_linter", "ruff_macros", + "ruff_python_ast", + "ruff_python_formatter", + "ruff_source_file", "rustc-hash", "schemars", "serde", @@ -2612,9 +2620,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763f8cd0d4c71ed8389c90cb8100cba87e763bd01a8e614d4f0af97bcd50a161" +checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c" dependencies = [ "dyn-clone", "schemars_derive", @@ -2624,9 +2632,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0f696e21e10fa546b7ffb1c9672c6de8fbc7a81acf59524386d8639bf12737" +checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c" dependencies = [ "proc-macro2", "quote", @@ -2656,6 +2664,12 @@ dependencies = [ "untrusted", ] +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + [[package]] name = "semver" version = "1.0.18" @@ -2690,7 +2704,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.37", ] [[package]] @@ -2706,9 +2720,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.106" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -2752,7 +2766,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.37", ] [[package]] @@ -2793,9 +2807,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "spin" @@ -2847,7 +2861,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.33", + "syn 2.0.37", ] [[package]] @@ -2863,9 +2877,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.33" +version = "2.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9caece70c63bfba29ec2fed841a09851b14a235c60010fa4de58089b6c025668" +checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" dependencies = [ "proc-macro2", "quote", @@ -2935,36 +2949,36 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "test-case" -version = "3.1.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a1d6e7bde536b0412f20765b76e921028059adfd1b90d8974d33fd3c91b25df" +checksum = "c8f1e820b7f1d95a0cdbf97a5df9de10e1be731983ab943e56703ac1b8e9d425" dependencies = [ "test-case-macros", ] [[package]] name = "test-case-core" -version = "3.1.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d10394d5d1e27794f772b6fc854c7e91a2dc26e2cbf807ad523370c2a59c0cee" +checksum = "54c25e2cb8f5fcd7318157634e8838aa6f7e4715c96637f969fabaccd1ef5462" dependencies = [ "cfg-if", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.37", ] [[package]] name = "test-case-macros" -version = "3.1.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb9a44b1c6a54c1ba58b152797739dba2a83ca74e18168a68c980eb142f9404" +checksum = "37cfd7bbc88a0104e304229fba519bdc45501a30b760fb72240342f1289ad257" dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.37", "test-case-core", ] @@ -2985,7 +2999,7 @@ checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.37", ] [[package]] @@ -3107,7 +3121,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.37", ] [[package]] @@ -3217,9 +3231,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -3232,9 +3246,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -3310,7 +3324,7 @@ checksum = "f7e1ba1f333bd65ce3c9f27de592fcbc256dafe3af2717f56d7c87761fbaccf4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.37", ] [[package]] @@ -3404,7 +3418,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.37", "wasm-bindgen-shared", ] @@ -3438,7 +3452,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.37", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 2c4c9eaba42..c08d9800f41 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.290"; + version = "0.0.291"; src = fetchFromGitHub { owner = "astral-sh"; repo = pname; rev = "v${version}"; - hash = "sha256-w2RqT0n++ggeNoEcrZSAF0056ctDBKGkV+GAscQcwOc="; + hash = "sha256-fAukXL0inAPdDpf//4yHYIQIKj3IifX9ObAM7VskDFI="; }; cargoLock = { From 2814ef8ffdd059e419ff361e411626cc5eff6477 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 22 Sep 2023 15:59:51 -0400 Subject: [PATCH 2/2] ruff-lsp: fix build on darwin --- .../tools/language-servers/ruff-lsp/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/tools/language-servers/ruff-lsp/default.nix b/pkgs/development/tools/language-servers/ruff-lsp/default.nix index abd9bbb52c9..0ad76efa9b3 100644 --- a/pkgs/development/tools/language-servers/ruff-lsp/default.nix +++ b/pkgs/development/tools/language-servers/ruff-lsp/default.nix @@ -3,6 +3,7 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub +, fetchpatch , ruff , pygls , lsprotocol @@ -26,6 +27,20 @@ buildPythonPackage rec { hash = "sha256-hbnSx59uSzXHeAhZPZnCzxl+mCZIdr29uUPfQCsm/Ww="; }; + patches = [ + # update tests to fix compatibility with ruff 0.0.291 + # https://github.com/astral-sh/ruff-lsp/pull/250 + (fetchpatch { + name = "bump-ruff-version.patch"; + url = "https://github.com/astral-sh/ruff-lsp/commit/35691407c4f489416a46fd2e88ef037b1204feb7.patch"; + hash = "sha256-D6k2BWDUqN4GBhjspRwg84Idr7fvKMbmAAkG3I1YOH4="; + excludes = [ + "requirements.txt" + "requirements-dev.txt" + ]; + }) + ]; + postPatch = '' # ruff binary added to PATH in wrapper so it's not needed sed -i '/"ruff>=/d' pyproject.toml