From 03aa7cafed83a62bac81d4204f7941a2519f14ba Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Sun, 17 Mar 2024 22:04:46 +0530 Subject: [PATCH] [feat] Add some patches --- common/goread.nix | 2 +- common/home.nix | 3 +- flake.nix | 1 + nixos/configuration.nix | 6 + overlays.nix | 27 +- patches/anyrun.patch | 2187 +++++++++++++++++++++++++++++++++++++++ patches/nixneovim.patch | 24 + 7 files changed, 2227 insertions(+), 23 deletions(-) create mode 100644 patches/anyrun.patch create mode 100644 patches/nixneovim.patch diff --git a/common/goread.nix b/common/goread.nix index 1322fe48..faaf3ecb 100644 --- a/common/goread.nix +++ b/common/goread.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{ ... }: { imports = [ ../modules/goread.nix ]; programs.goread = { enable = true; diff --git a/common/home.nix b/common/home.nix index fa104753..a59c6022 100644 --- a/common/home.nix +++ b/common/home.nix @@ -10,9 +10,8 @@ home.packages = with pkgs; [ - russ go - + p7zip picat spotdl davis diff --git a/flake.nix b/flake.nix index 195e47e3..78a69bd1 100644 --- a/flake.nix +++ b/flake.nix @@ -43,6 +43,7 @@ # url = "github:nixneovim/nixneovim"; url = "github:uttarayan21/NixNeovim"; inputs.nixpkgs.follows = "nixpkgs"; + # patches = [ ./patches/nixneovim.patch ]; }; # nixneovimplugins = { # url = "github:NixNeovim/NixNeovimPlugins"; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index fb89aa37..bd1d128b 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -167,6 +167,12 @@ hyprland.enable = true; hyprland.xwayland.enable = true; yubikey-touch-detector.enable = true; + steam = { + enable = true; + gamescopeSession.enable = true; + remotePlay.openFirewall = true; + dedicatedServer.openFirewall = true; + }; }; security.rtkit.enable = true; diff --git a/overlays.nix b/overlays.nix index abd09a4b..03b6de52 100644 --- a/overlays.nix +++ b/overlays.nix @@ -74,26 +74,6 @@ let src = picat-src; cargoLock = { lockFile = "${picat-src}/Cargo.lock"; }; }; - - # russ = - # let - # src = final.pkgs.fetchFromGitHub { - # owner = "ckampfe"; - # repo = "russ"; - # rev = "master"; - # sha256 = "sha256-WJ/arI1zwt5UJNxo3MowKxof4wjROhgoRcfEYqWkYB8"; - # }; - # cargoToml = builtins.fromTOML (builtins.readFile "${src}/Cargo.toml"); - # in - # final.pkgs.rustPlatform.buildRustPackage rec { - # pname = cargoToml.package.name; - # version = cargoToml.package.version; - # inherit src; - # doCheck = false; - # cargoLock = { lockFile = "${src}/Cargo.lock"; }; - # }; - - }; anyrun-overlay = final: prev: { @@ -170,6 +150,13 @@ let ''; }); + + # nixneovim = nixneovim.applyPatches { + # name = "nixneovim-patched"; + # src = inputs.nixneovim; + # patches = [ ./patches/nixneovim.patch ]; + # }; + tree-sitter-grammars = (final: prev: { tree-sitter-grammars = prev.tree-sitter-grammars // { tree-sitter-just = final.pkgs.tree-sitter.buildGrammar { diff --git a/patches/anyrun.patch b/patches/anyrun.patch new file mode 100644 index 00000000..29913360 --- /dev/null +++ b/patches/anyrun.patch @@ -0,0 +1,2187 @@ +diff --git a/Cargo.lock b/Cargo.lock +index a786524..87e363c 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -4,9 +4,9 @@ version = 3 + + [[package]] + name = "abi_stable" +-version = "0.11.2" ++version = "0.11.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "467388fe07f5a809f4df42226142cadd5a7706810b76a0896fd68d156b1ea886" ++checksum = "69d6512d3eb05ffe5004c59c206de7f99c34951504056ce23fc953842f12c445" + dependencies = [ + "abi_stable_derive", + "abi_stable_shared", +@@ -27,9 +27,9 @@ dependencies = [ + + [[package]] + name = "abi_stable_derive" +-version = "0.11.0" ++version = "0.11.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0aecd3efa5a5294f5c67913d45f985ccb382b3c93327581529610eeecdf4821a" ++checksum = "d7178468b407a4ee10e881bc7a328a65e739f0863615cca4429d43916b05e898" + dependencies = [ + "abi_stable_shared", + "as_derive_utils", +@@ -52,9 +52,9 @@ dependencies = [ + + [[package]] + name = "addr2line" +-version = "0.20.0" ++version = "0.21.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" ++checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" + dependencies = [ + "gimli", + ] +@@ -67,9 +67,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + + [[package]] + name = "aho-corasick" +-version = "1.0.4" ++version = "1.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" ++checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" + dependencies = [ + "memchr", + ] +@@ -91,58 +91,57 @@ dependencies = [ + + [[package]] + name = "anstream" +-version = "0.3.2" ++version = "0.6.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" ++checksum = "96b09b5178381e0874812a9b157f7fe84982617e48f71f4e3235482775e5b540" + dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", +- "is-terminal", + "utf8parse", + ] + + [[package]] + name = "anstyle" +-version = "1.0.1" ++version = "1.0.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" ++checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + + [[package]] + name = "anstyle-parse" +-version = "0.2.1" ++version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" ++checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" + dependencies = [ + "utf8parse", + ] + + [[package]] + name = "anstyle-query" +-version = "1.0.0" ++version = "1.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" ++checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" + dependencies = [ +- "windows-sys 0.48.0", ++ "windows-sys 0.52.0", + ] + + [[package]] + name = "anstyle-wincon" +-version = "1.0.2" ++version = "3.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" ++checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" + dependencies = [ + "anstyle", +- "windows-sys 0.48.0", ++ "windows-sys 0.52.0", + ] + + [[package]] + name = "anyhow" +-version = "1.0.75" ++version = "1.0.79" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" ++checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" + + [[package]] + name = "anyrun" +@@ -154,7 +153,7 @@ dependencies = [ + "clap", + "gtk", + "gtk-layer-shell", +- "nix 0.26.2", ++ "nix 0.26.4", + "ron", + "serde", + "wl-clipboard-rs", +@@ -172,7 +171,7 @@ name = "anyrun-macros" + version = "0.1.0" + dependencies = [ + "quote", +- "syn 2.0.29", ++ "syn 2.0.49", + ] + + [[package]] +@@ -210,13 +209,13 @@ dependencies = [ + + [[package]] + name = "async-trait" +-version = "0.1.73" ++version = "0.1.77" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" ++checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.29", ++ "syn 2.0.49", + ] + + [[package]] +@@ -251,9 +250,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + + [[package]] + name = "backtrace" +-version = "0.3.68" ++version = "0.3.69" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" ++checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" + dependencies = [ + "addr2line", + "cc", +@@ -266,9 +265,9 @@ dependencies = [ + + [[package]] + name = "base64" +-version = "0.21.2" ++version = "0.21.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" ++checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + + [[package]] + name = "bitflags" +@@ -278,30 +277,30 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + + [[package]] + name = "bitflags" +-version = "2.4.0" ++version = "2.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" ++checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" + dependencies = [ + "serde", + ] + + [[package]] + name = "bumpalo" +-version = "3.13.0" ++version = "3.15.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" ++checksum = "d32a994c2b3ca201d9b263612a374263f05e7adde37c4707f693dcd375076d1f" + + [[package]] + name = "bytecount" +-version = "0.6.3" ++version = "0.6.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" ++checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" + + [[package]] + name = "bytes" +-version = "1.4.0" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" ++checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + + [[package]] + name = "cairo-rs" +@@ -330,18 +329,18 @@ dependencies = [ + + [[package]] + name = "cc" +-version = "1.0.82" ++version = "1.0.83" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" ++checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" + dependencies = [ + "libc", + ] + + [[package]] + name = "cfg-expr" +-version = "0.15.4" ++version = "0.15.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" ++checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" + dependencies = [ + "smallvec", + "target-lexicon", +@@ -355,17 +354,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + + [[package]] + name = "chrono" +-version = "0.4.26" ++version = "0.4.34" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" ++checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" + dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", +- "time", + "wasm-bindgen", +- "winapi", ++ "windows-targets 0.52.0", + ] + + [[package]] +@@ -389,44 +387,43 @@ dependencies = [ + + [[package]] + name = "clap" +-version = "4.3.23" ++version = "4.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "03aef18ddf7d879c15ce20f04826ef8418101c7e528014c3eeea13321047dca3" ++checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" + dependencies = [ + "clap_builder", + "clap_derive", +- "once_cell", + ] + + [[package]] + name = "clap_builder" +-version = "4.3.23" ++version = "4.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f8ce6fffb678c9b80a70b6b6de0aad31df727623a70fd9a842c30cd573e2fa98" ++checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" + dependencies = [ + "anstream", + "anstyle", + "clap_lex", +- "strsim", ++ "strsim 0.11.0", + ] + + [[package]] + name = "clap_derive" +-version = "4.3.12" ++version = "4.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" ++checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" + dependencies = [ + "heck", + "proc-macro2", + "quote", +- "syn 2.0.29", ++ "syn 2.0.49", + ] + + [[package]] + name = "clap_lex" +-version = "0.5.0" ++version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" ++checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" + + [[package]] + name = "colorchoice" +@@ -446,11 +443,21 @@ version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + ++[[package]] ++name = "core-foundation" ++version = "0.9.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" ++dependencies = [ ++ "core-foundation-sys", ++ "libc", ++] ++ + [[package]] + name = "core-foundation-sys" +-version = "0.8.4" ++version = "0.8.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" ++checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + + [[package]] + name = "core_extensions" +@@ -469,22 +476,18 @@ checksum = "69f3b219d28b6e3b4ac87bc1fc522e0803ab22e055da177bff0068c4150c61a6" + + [[package]] + name = "crossbeam-channel" +-version = "0.5.8" ++version = "0.5.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" ++checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" + dependencies = [ +- "cfg-if", + "crossbeam-utils", + ] + + [[package]] + name = "crossbeam-utils" +-version = "0.8.16" ++version = "0.8.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +-dependencies = [ +- "cfg-if", +-] ++checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + + [[package]] + name = "derive-new" +@@ -535,9 +538,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + + [[package]] + name = "encoding_rs" +-version = "0.8.32" ++version = "0.8.33" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" ++checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" + dependencies = [ + "cfg-if", + ] +@@ -550,30 +553,19 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + + [[package]] + name = "errno" +-version = "0.3.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +-dependencies = [ +- "errno-dragonfly", +- "libc", +- "windows-sys 0.48.0", +-] +- +-[[package]] +-name = "errno-dragonfly" +-version = "0.1.2" ++version = "0.3.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" ++checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" + dependencies = [ +- "cc", + "libc", ++ "windows-sys 0.52.0", + ] + + [[package]] + name = "fastrand" +-version = "2.0.0" ++version = "2.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" ++checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + + [[package]] + name = "field-offset" +@@ -599,18 +591,18 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + + [[package]] + name = "form_urlencoded" +-version = "1.2.0" ++version = "1.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" ++checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" + dependencies = [ + "percent-encoding", + ] + + [[package]] + name = "futures" +-version = "0.3.28" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" ++checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" + dependencies = [ + "futures-channel", + "futures-core", +@@ -623,9 +615,9 @@ dependencies = [ + + [[package]] + name = "futures-channel" +-version = "0.3.28" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" ++checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" + dependencies = [ + "futures-core", + "futures-sink", +@@ -633,15 +625,15 @@ dependencies = [ + + [[package]] + name = "futures-core" +-version = "0.3.28" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" ++checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + + [[package]] + name = "futures-executor" +-version = "0.3.28" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" ++checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" + dependencies = [ + "futures-core", + "futures-task", +@@ -650,38 +642,38 @@ dependencies = [ + + [[package]] + name = "futures-io" +-version = "0.3.28" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" ++checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + + [[package]] + name = "futures-macro" +-version = "0.3.28" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" ++checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.29", ++ "syn 2.0.49", + ] + + [[package]] + name = "futures-sink" +-version = "0.3.28" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" ++checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + + [[package]] + name = "futures-task" +-version = "0.3.28" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" ++checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + + [[package]] + name = "futures-util" +-version = "0.3.28" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" ++checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" + dependencies = [ + "futures-channel", + "futures-core", +@@ -772,11 +764,22 @@ dependencies = [ + "cfg-if", + ] + ++[[package]] ++name = "getrandom" ++version = "0.2.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "wasi", ++] ++ + [[package]] + name = "gimli" +-version = "0.27.3" ++version = "0.28.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" ++checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + + [[package]] + name = "gio" +@@ -954,9 +957,9 @@ dependencies = [ + + [[package]] + name = "h2" +-version = "0.3.20" ++version = "0.3.24" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" ++checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" + dependencies = [ + "bytes", + "fnv", +@@ -964,7 +967,7 @@ dependencies = [ + "futures-sink", + "futures-util", + "http", +- "indexmap 1.9.3", ++ "indexmap", + "slab", + "tokio", + "tokio-util", +@@ -973,15 +976,9 @@ dependencies = [ + + [[package]] + name = "hashbrown" +-version = "0.12.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +- +-[[package]] +-name = "hashbrown" +-version = "0.14.0" ++version = "0.14.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" ++checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + + [[package]] + name = "heck" +@@ -991,9 +988,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + + [[package]] + name = "hermit-abi" +-version = "0.3.2" ++version = "0.3.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" ++checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" + + [[package]] + name = "hex" +@@ -1003,9 +1000,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + + [[package]] + name = "http" +-version = "0.2.9" ++version = "0.2.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" ++checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" + dependencies = [ + "bytes", + "fnv", +@@ -1014,9 +1011,9 @@ dependencies = [ + + [[package]] + name = "http-body" +-version = "0.4.5" ++version = "0.4.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" ++checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" + dependencies = [ + "bytes", + "http", +@@ -1037,9 +1034,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + + [[package]] + name = "hyper" +-version = "0.14.27" ++version = "0.14.28" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" ++checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" + dependencies = [ + "bytes", + "futures-channel", +@@ -1052,7 +1049,7 @@ dependencies = [ + "httpdate", + "itoa", + "pin-project-lite", +- "socket2 0.4.9", ++ "socket2", + "tokio", + "tower-service", + "tracing", +@@ -1061,9 +1058,9 @@ dependencies = [ + + [[package]] + name = "hyper-rustls" +-version = "0.24.1" ++version = "0.24.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" ++checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" + dependencies = [ + "futures-util", + "http", +@@ -1075,9 +1072,9 @@ dependencies = [ + + [[package]] + name = "hyprland" +-version = "0.3.9" ++version = "0.3.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5b1eac91e67a2db723b96dee0883a7b3ccce55d1ee26e7373c497505f7a3c4b8" ++checksum = "f87a8f1cc065d451894dd3916c0bc3fcf9b67b276126c05f27b1db912688dde8" + dependencies = [ + "async-trait", + "derive_more", +@@ -1092,7 +1089,7 @@ dependencies = [ + "serde", + "serde_json", + "serde_repr", +- "strum", ++ "strum 0.26.1", + "tokio", + ] + +@@ -1103,21 +1100,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c941d3d52e979612af8cb94e8de49000c7fada2014a7791d173ab41339f4e4eb" + dependencies = [ + "quote", +- "syn 2.0.29", ++ "syn 2.0.49", + ] + + [[package]] + name = "iana-time-zone" +-version = "0.1.57" ++version = "0.1.60" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" ++checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" + dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", +- "windows", ++ "windows-core", + ] + + [[package]] +@@ -1131,9 +1128,9 @@ dependencies = [ + + [[package]] + name = "idna" +-version = "0.4.0" ++version = "0.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" ++checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" + dependencies = [ + "unicode-bidi", + "unicode-normalization", +@@ -1141,52 +1138,31 @@ dependencies = [ + + [[package]] + name = "indexmap" +-version = "1.9.3" ++version = "2.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +-dependencies = [ +- "autocfg", +- "hashbrown 0.12.3", +-] +- +-[[package]] +-name = "indexmap" +-version = "2.0.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" ++checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" + dependencies = [ + "equivalent", +- "hashbrown 0.14.0", ++ "hashbrown", + ] + + [[package]] + name = "ipnet" +-version = "2.8.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +- +-[[package]] +-name = "is-terminal" +-version = "0.4.9" ++version = "2.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +-dependencies = [ +- "hermit-abi", +- "rustix", +- "windows-sys 0.48.0", +-] ++checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + + [[package]] + name = "itoa" +-version = "1.0.9" ++version = "1.0.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" ++checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + + [[package]] + name = "js-sys" +-version = "0.3.64" ++version = "0.3.68" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" ++checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" + dependencies = [ + "wasm-bindgen", + ] +@@ -1222,9 +1198,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" +-version = "0.2.147" ++version = "0.2.153" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" ++checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + + [[package]] + name = "libloading" +@@ -1238,15 +1214,15 @@ dependencies = [ + + [[package]] + name = "linux-raw-sys" +-version = "0.4.5" ++version = "0.4.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" ++checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + + [[package]] + name = "lock_api" +-version = "0.4.10" ++version = "0.4.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" ++checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" + dependencies = [ + "autocfg", + "scopeguard", +@@ -1260,9 +1236,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + + [[package]] + name = "memchr" +-version = "2.5.0" ++version = "2.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" ++checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + + [[package]] + name = "memoffset" +@@ -1296,21 +1272,21 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + + [[package]] + name = "miniz_oxide" +-version = "0.7.1" ++version = "0.7.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" ++checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" + dependencies = [ + "adler", + ] + + [[package]] + name = "mio" +-version = "0.8.8" ++version = "0.8.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" ++checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" + dependencies = [ + "libc", +- "wasi 0.11.0+wasi-snapshot-preview1", ++ "wasi", + "windows-sys 0.48.0", + ] + +@@ -1328,14 +1304,13 @@ dependencies = [ + + [[package]] + name = "nix" +-version = "0.26.2" ++version = "0.26.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" ++checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" + dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", +- "static_assertions", + ] + + [[package]] +@@ -1364,9 +1339,9 @@ dependencies = [ + + [[package]] + name = "num-bigint" +-version = "0.4.3" ++version = "0.4.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" ++checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" + dependencies = [ + "autocfg", + "num-integer", +@@ -1376,9 +1351,9 @@ dependencies = [ + + [[package]] + name = "num-complex" +-version = "0.4.4" ++version = "0.4.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" ++checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" + dependencies = [ + "num-traits", + "serde", +@@ -1386,19 +1361,18 @@ dependencies = [ + + [[package]] + name = "num-integer" +-version = "0.1.45" ++version = "0.1.46" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" ++checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" + dependencies = [ +- "autocfg", + "num-traits", + ] + + [[package]] + name = "num-iter" +-version = "0.1.43" ++version = "0.1.44" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" ++checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" + dependencies = [ + "autocfg", + "num-integer", +@@ -1420,9 +1394,9 @@ dependencies = [ + + [[package]] + name = "num-traits" +-version = "0.2.16" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" ++checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" + dependencies = [ + "autocfg", + ] +@@ -1439,18 +1413,18 @@ dependencies = [ + + [[package]] + name = "object" +-version = "0.31.1" ++version = "0.32.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" ++checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" + dependencies = [ + "memchr", + ] + + [[package]] + name = "once_cell" +-version = "1.18.0" ++version = "1.19.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" ++checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + + [[package]] + name = "open" +@@ -1464,12 +1438,12 @@ dependencies = [ + + [[package]] + name = "os_pipe" +-version = "1.1.4" ++version = "1.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" ++checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" + dependencies = [ + "libc", +- "windows-sys 0.48.0", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -1510,15 +1484,15 @@ dependencies = [ + + [[package]] + name = "parking_lot_core" +-version = "0.9.8" ++version = "0.9.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" ++checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" + dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", +- "windows-targets", ++ "windows-targets 0.48.5", + ] + + [[package]] +@@ -1544,25 +1518,25 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + + [[package]] + name = "percent-encoding" +-version = "2.3.0" ++version = "2.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" ++checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + + [[package]] + name = "petgraph" +-version = "0.6.3" ++version = "0.6.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" ++checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" + dependencies = [ + "fixedbitset", +- "indexmap 1.9.3", ++ "indexmap", + ] + + [[package]] + name = "pin-project-lite" +-version = "0.2.12" ++version = "0.2.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" ++checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + + [[package]] + name = "pin-utils" +@@ -1572,9 +1546,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + + [[package]] + name = "pkg-config" +-version = "0.3.27" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" ++checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + + [[package]] + name = "proc-macro-crate" +@@ -1583,7 +1557,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" + dependencies = [ + "once_cell", +- "toml_edit", ++ "toml_edit 0.19.15", + ] + + [[package]] +@@ -1612,18 +1586,18 @@ dependencies = [ + + [[package]] + name = "proc-macro2" +-version = "1.0.66" ++version = "1.0.78" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" ++checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" + dependencies = [ + "unicode-ident", + ] + + [[package]] + name = "quote" +-version = "1.0.33" ++version = "1.0.35" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" ++checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" + dependencies = [ + "proc-macro2", + ] +@@ -1642,18 +1616,18 @@ dependencies = [ + + [[package]] + name = "redox_syscall" +-version = "0.3.5" ++version = "0.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" ++checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" + dependencies = [ + "bitflags 1.3.2", + ] + + [[package]] + name = "regex" +-version = "1.9.3" ++version = "1.10.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" ++checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" + dependencies = [ + "aho-corasick", + "memchr", +@@ -1663,9 +1637,9 @@ dependencies = [ + + [[package]] + name = "regex-automata" +-version = "0.3.6" ++version = "0.4.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" ++checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" + dependencies = [ + "aho-corasick", + "memchr", +@@ -1674,9 +1648,9 @@ dependencies = [ + + [[package]] + name = "regex-syntax" +-version = "0.7.4" ++version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" ++checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + + [[package]] + name = "repr_offset" +@@ -1689,9 +1663,9 @@ dependencies = [ + + [[package]] + name = "reqwest" +-version = "0.11.18" ++version = "0.11.24" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" ++checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" + dependencies = [ + "base64", + "bytes", +@@ -1715,6 +1689,8 @@ dependencies = [ + "serde", + "serde_json", + "serde_urlencoded", ++ "sync_wrapper", ++ "system-configuration", + "tokio", + "tokio-rustls", + "tower-service", +@@ -1728,17 +1704,17 @@ dependencies = [ + + [[package]] + name = "ring" +-version = "0.16.20" ++version = "0.17.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" ++checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" + dependencies = [ + "cc", ++ "cfg-if", ++ "getrandom", + "libc", +- "once_cell", + "spin", + "untrusted", +- "web-sys", +- "winapi", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -1763,7 +1739,7 @@ dependencies = [ + "num", + "serde", + "serde_derive", +- "strsim", ++ "strsim 0.10.0", + ] + + [[package]] +@@ -1773,7 +1749,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" + dependencies = [ + "base64", +- "bitflags 2.4.0", ++ "bitflags 2.4.2", + "serde", + "serde_derive", + ] +@@ -1795,22 +1771,22 @@ dependencies = [ + + [[package]] + name = "rustix" +-version = "0.38.8" ++version = "0.38.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" ++checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" + dependencies = [ +- "bitflags 2.4.0", ++ "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys", +- "windows-sys 0.48.0", ++ "windows-sys 0.52.0", + ] + + [[package]] + name = "rustls" +-version = "0.21.6" ++version = "0.21.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" ++checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" + dependencies = [ + "log", + "ring", +@@ -1820,18 +1796,18 @@ dependencies = [ + + [[package]] + name = "rustls-pemfile" +-version = "1.0.3" ++version = "1.0.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" ++checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" + dependencies = [ + "base64", + ] + + [[package]] + name = "rustls-webpki" +-version = "0.101.3" ++version = "0.101.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "261e9e0888cba427c3316e6322805653c9425240b6fd96cee7cb671ab70ab8d0" ++checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" + dependencies = [ + "ring", + "untrusted", +@@ -1845,9 +1821,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + + [[package]] + name = "ryu" +-version = "1.0.15" ++version = "1.0.16" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" ++checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" + + [[package]] + name = "scopeguard" +@@ -1857,9 +1833,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + + [[package]] + name = "sct" +-version = "0.7.0" ++version = "0.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" ++checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" + dependencies = [ + "ring", + "untrusted", +@@ -1867,35 +1843,35 @@ dependencies = [ + + [[package]] + name = "semver" +-version = "1.0.18" ++version = "1.0.21" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" ++checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" + + [[package]] + name = "serde" +-version = "1.0.183" ++version = "1.0.196" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" ++checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.183" ++version = "1.0.196" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" ++checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.29", ++ "syn 2.0.49", + ] + + [[package]] + name = "serde_json" +-version = "1.0.105" ++version = "1.0.113" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" ++checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" + dependencies = [ + "itoa", + "ryu", +@@ -1904,20 +1880,20 @@ dependencies = [ + + [[package]] + name = "serde_repr" +-version = "0.1.16" ++version = "0.1.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" ++checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.29", ++ "syn 2.0.49", + ] + + [[package]] + name = "serde_spanned" +-version = "0.6.3" ++version = "0.6.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" ++checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" + dependencies = [ + "serde", + ] +@@ -1955,34 +1931,24 @@ dependencies = [ + + [[package]] + name = "slab" +-version = "0.4.8" ++version = "0.4.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" ++checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" + dependencies = [ + "autocfg", + ] + + [[package]] + name = "smallvec" +-version = "1.11.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +- +-[[package]] +-name = "socket2" +-version = "0.4.9" ++version = "1.13.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +-dependencies = [ +- "libc", +- "winapi", +-] ++checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" + + [[package]] + name = "socket2" +-version = "0.5.3" ++version = "0.5.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" ++checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" + dependencies = [ + "libc", + "windows-sys 0.48.0", +@@ -1990,15 +1956,9 @@ dependencies = [ + + [[package]] + name = "spin" +-version = "0.5.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +- +-[[package]] +-name = "static_assertions" +-version = "1.1.0" ++version = "0.9.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" ++checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + + [[package]] + name = "stdin" +@@ -2017,26 +1977,51 @@ version = "0.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + ++[[package]] ++name = "strsim" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" ++ + [[package]] + name = "strum" + version = "0.25.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" ++ ++[[package]] ++name = "strum" ++version = "0.26.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" ++dependencies = [ ++ "strum_macros 0.26.1", ++] ++ ++[[package]] ++name = "strum_macros" ++version = "0.25.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" + dependencies = [ +- "strum_macros", ++ "heck", ++ "proc-macro2", ++ "quote", ++ "rustversion", ++ "syn 2.0.49", + ] + + [[package]] + name = "strum_macros" +-version = "0.25.2" ++version = "0.26.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" ++checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" + dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", +- "syn 2.0.29", ++ "syn 2.0.49", + ] + + [[package]] +@@ -2069,20 +2054,47 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "2.0.29" ++version = "2.0.49" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" ++checksum = "915aea9e586f80826ee59f8453c1101f9d1c4b3964cd2460185ee8e299ada496" + dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", + ] + ++[[package]] ++name = "sync_wrapper" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" ++ ++[[package]] ++name = "system-configuration" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" ++dependencies = [ ++ "bitflags 1.3.2", ++ "core-foundation", ++ "system-configuration-sys", ++] ++ ++[[package]] ++name = "system-configuration-sys" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" ++dependencies = [ ++ "core-foundation-sys", ++ "libc", ++] ++ + [[package]] + name = "system-deps" +-version = "6.1.1" ++version = "6.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" ++checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" + dependencies = [ + "cfg-expr", + "heck", +@@ -2093,41 +2105,40 @@ dependencies = [ + + [[package]] + name = "target-lexicon" +-version = "0.12.11" ++version = "0.12.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" ++checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" + + [[package]] + name = "tempfile" +-version = "3.8.0" ++version = "3.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" ++checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" + dependencies = [ + "cfg-if", + "fastrand", +- "redox_syscall", + "rustix", +- "windows-sys 0.48.0", ++ "windows-sys 0.52.0", + ] + + [[package]] + name = "thiserror" +-version = "1.0.47" ++version = "1.0.57" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" ++checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" + dependencies = [ + "thiserror-impl", + ] + + [[package]] + name = "thiserror-impl" +-version = "1.0.47" ++version = "1.0.57" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" ++checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.29", ++ "syn 2.0.49", + ] + + [[package]] +@@ -2140,17 +2151,6 @@ dependencies = [ + "once_cell", + ] + +-[[package]] +-name = "time" +-version = "0.1.45" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +-dependencies = [ +- "libc", +- "wasi 0.10.0+wasi-snapshot-preview1", +- "winapi", +-] +- + [[package]] + name = "tinyvec" + version = "1.6.0" +@@ -2168,9 +2168,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + + [[package]] + name = "tokio" +-version = "1.32.0" ++version = "1.36.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" ++checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" + dependencies = [ + "backtrace", + "bytes", +@@ -2180,20 +2180,20 @@ dependencies = [ + "parking_lot", + "pin-project-lite", + "signal-hook-registry", +- "socket2 0.5.3", ++ "socket2", + "tokio-macros", + "windows-sys 0.48.0", + ] + + [[package]] + name = "tokio-macros" +-version = "2.1.0" ++version = "2.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" ++checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.29", ++ "syn 2.0.49", + ] + + [[package]] +@@ -2208,9 +2208,9 @@ dependencies = [ + + [[package]] + name = "tokio-util" +-version = "0.7.8" ++version = "0.7.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" ++checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" + dependencies = [ + "bytes", + "futures-core", +@@ -2222,36 +2222,47 @@ dependencies = [ + + [[package]] + name = "toml" +-version = "0.7.6" ++version = "0.8.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" ++checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" + dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", +- "toml_edit", ++ "toml_edit 0.22.6", + ] + + [[package]] + name = "toml_datetime" +-version = "0.6.3" ++version = "0.6.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" ++checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" + dependencies = [ + "serde", + ] + + [[package]] + name = "toml_edit" +-version = "0.19.14" ++version = "0.19.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" ++checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" + dependencies = [ +- "indexmap 2.0.0", ++ "indexmap", ++ "toml_datetime", ++ "winnow 0.5.40", ++] ++ ++[[package]] ++name = "toml_edit" ++version = "0.22.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" ++dependencies = [ ++ "indexmap", + "serde", + "serde_spanned", + "toml_datetime", +- "winnow", ++ "winnow 0.6.1", + ] + + [[package]] +@@ -2262,20 +2273,19 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + + [[package]] + name = "tracing" +-version = "0.1.37" ++version = "0.1.40" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" ++checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" + dependencies = [ +- "cfg-if", + "pin-project-lite", + "tracing-core", + ] + + [[package]] + name = "tracing-core" +-version = "0.1.31" ++version = "0.1.32" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" ++checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" + dependencies = [ + "once_cell", + ] +@@ -2311,9 +2321,9 @@ dependencies = [ + + [[package]] + name = "try-lock" +-version = "0.2.4" ++version = "0.2.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" ++checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + + [[package]] + name = "tstr" +@@ -2338,15 +2348,15 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" + + [[package]] + name = "unicode-bidi" +-version = "0.3.13" ++version = "0.3.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" ++checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + + [[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" +@@ -2359,15 +2369,15 @@ dependencies = [ + + [[package]] + name = "untrusted" +-version = "0.7.1" ++version = "0.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" ++checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + + [[package]] + name = "url" +-version = "2.4.0" ++version = "2.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" ++checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" + dependencies = [ + "form_urlencoded", + "idna", +@@ -2407,12 +2417,6 @@ dependencies = [ + "try-lock", + ] + +-[[package]] +-name = "wasi" +-version = "0.10.0+wasi-snapshot-preview1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +- + [[package]] + name = "wasi" + version = "0.11.0+wasi-snapshot-preview1" +@@ -2421,9 +2425,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + + [[package]] + name = "wasm-bindgen" +-version = "0.2.87" ++version = "0.2.91" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" ++checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" + dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +@@ -2431,24 +2435,24 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-backend" +-version = "0.2.87" ++version = "0.2.91" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" ++checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" + dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", +- "syn 2.0.29", ++ "syn 2.0.49", + "wasm-bindgen-shared", + ] + + [[package]] + name = "wasm-bindgen-futures" +-version = "0.4.37" ++version = "0.4.41" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" ++checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" + dependencies = [ + "cfg-if", + "js-sys", +@@ -2458,9 +2462,9 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro" +-version = "0.2.87" ++version = "0.2.91" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" ++checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" + dependencies = [ + "quote", + "wasm-bindgen-macro-support", +@@ -2468,22 +2472,22 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro-support" +-version = "0.2.87" ++version = "0.2.91" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" ++checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.29", ++ "syn 2.0.49", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] + + [[package]] + name = "wasm-bindgen-shared" +-version = "0.2.87" ++version = "0.2.91" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" ++checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" + + [[package]] + name = "wayland-client" +@@ -2546,32 +2550,19 @@ dependencies = [ + + [[package]] + name = "web-sys" +-version = "0.3.64" ++version = "0.3.68" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" ++checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" + dependencies = [ + "js-sys", + "wasm-bindgen", + ] + +-[[package]] +-name = "webpki" +-version = "0.22.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +-dependencies = [ +- "ring", +- "untrusted", +-] +- + [[package]] + name = "webpki-roots" +-version = "0.22.6" ++version = "0.25.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +-dependencies = [ +- "webpki", +-] ++checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + + [[package]] + name = "websearch" +@@ -2581,8 +2572,8 @@ dependencies = [ + "anyrun-plugin", + "ron", + "serde", +- "strum", +- "strum_macros", ++ "strum 0.25.0", ++ "strum_macros 0.25.3", + "urlencoding", + ] + +@@ -2609,12 +2600,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + + [[package]] +-name = "windows" +-version = "0.48.0" ++name = "windows-core" ++version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" ++checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" + dependencies = [ +- "windows-targets", ++ "windows-targets 0.52.0", + ] + + [[package]] +@@ -2638,7 +2629,16 @@ version = "0.48.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" + dependencies = [ +- "windows-targets", ++ "windows-targets 0.48.5", ++] ++ ++[[package]] ++name = "windows-sys" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" ++dependencies = [ ++ "windows-targets 0.52.0", + ] + + [[package]] +@@ -2656,6 +2656,21 @@ dependencies = [ + "windows_x86_64_msvc 0.48.5", + ] + ++[[package]] ++name = "windows-targets" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" ++dependencies = [ ++ "windows_aarch64_gnullvm 0.52.0", ++ "windows_aarch64_msvc 0.52.0", ++ "windows_i686_gnu 0.52.0", ++ "windows_i686_msvc 0.52.0", ++ "windows_x86_64_gnu 0.52.0", ++ "windows_x86_64_gnullvm 0.52.0", ++ "windows_x86_64_msvc 0.52.0", ++] ++ + [[package]] + name = "windows_aarch64_gnullvm" + version = "0.42.2" +@@ -2668,6 +2683,12 @@ version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + ++[[package]] ++name = "windows_aarch64_gnullvm" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" ++ + [[package]] + name = "windows_aarch64_msvc" + version = "0.42.2" +@@ -2680,6 +2701,12 @@ version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + ++[[package]] ++name = "windows_aarch64_msvc" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" ++ + [[package]] + name = "windows_i686_gnu" + version = "0.42.2" +@@ -2692,6 +2719,12 @@ version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + ++[[package]] ++name = "windows_i686_gnu" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" ++ + [[package]] + name = "windows_i686_msvc" + version = "0.42.2" +@@ -2704,6 +2737,12 @@ version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + ++[[package]] ++name = "windows_i686_msvc" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" ++ + [[package]] + name = "windows_x86_64_gnu" + version = "0.42.2" +@@ -2716,6 +2755,12 @@ version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + ++[[package]] ++name = "windows_x86_64_gnu" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" ++ + [[package]] + name = "windows_x86_64_gnullvm" + version = "0.42.2" +@@ -2728,6 +2773,12 @@ version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + ++[[package]] ++name = "windows_x86_64_gnullvm" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" ++ + [[package]] + name = "windows_x86_64_msvc" + version = "0.42.2" +@@ -2740,22 +2791,38 @@ version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + ++[[package]] ++name = "windows_x86_64_msvc" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" ++ + [[package]] + name = "winnow" +-version = "0.5.14" ++version = "0.5.40" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d09770118a7eb1ccaf4a594a221334119a44a814fcb0d31c5b85e83e97227a97" ++checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "winnow" ++version = "0.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d90f4e0f530c4c69f62b80d839e9ef3855edc9cba471a160c4d692deed62b401" + dependencies = [ + "memchr", + ] + + [[package]] + name = "winreg" +-version = "0.10.1" ++version = "0.50.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" ++checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" + dependencies = [ +- "winapi", ++ "cfg-if", ++ "windows-sys 0.48.0", + ] + + [[package]] +@@ -2778,6 +2845,6 @@ dependencies = [ + + [[package]] + name = "xml-rs" +-version = "0.8.16" ++version = "0.8.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1" ++checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +diff --git a/anyrun/src/main.rs b/anyrun/src/main.rs +index fb9f62e..ac006c1 100644 +--- a/anyrun/src/main.rs ++++ b/anyrun/src/main.rs +@@ -12,7 +12,11 @@ use std::{ + use abi_stable::std_types::{ROption, RVec}; + use anyrun_interface::{HandleResult, Match, PluginInfo, PluginRef, PollResult}; + use clap::{Parser, ValueEnum}; +-use gtk::{gdk, gdk_pixbuf, gio, glib, prelude::*}; ++use gtk::{ ++ gdk::{self, ModifierType}, ++ gdk_pixbuf, gio, glib, ++ prelude::*, ++}; + use nix::unistd; + use serde::Deserialize; + use wl_clipboard_rs::copy; +@@ -477,14 +481,18 @@ fn activate(app: >k::Application, runtime_data: Rc>) { + + window.connect_key_press_event(move |window, event| { + use gdk::keys::constants; +- match event.keyval() { ++ match (event.state(), event.keyval()) { + // Close window on escape +- constants::Escape => { ++ (_, constants::Escape) => { + window.close(); + Inhibit(true) + } + // Handle selections +- constants::Down | constants::Tab | constants::Up => { ++ (_, constants::Down) ++ | (_, constants::Tab) ++ | (_, constants::Up) ++ | (ModifierType::CONTROL_MASK, constants::p) ++ | (ModifierType::CONTROL_MASK, constants::n) => { + // Combine all of the matches into a `Vec` to allow for easier handling of the selection + let combined_matches = runtime_data_clone + .borrow() +@@ -511,10 +519,12 @@ fn activate(app: >k::Application, runtime_data: Rc>) { + // If nothing is selected select either the top or bottom match based on the input + if !combined_matches.is_empty() { + match event.keyval() { +- constants::Down | constants::Tab => combined_matches[0] +- .1 +- .select_row(Some(&combined_matches[0].0)), +- constants::Up => { ++ constants::Down | constants::Tab | constants::n => { ++ combined_matches[0] ++ .1 ++ .select_row(Some(&combined_matches[0].0)) ++ } ++ constants::Up | constants::p => { + combined_matches[combined_matches.len() - 1].1.select_row( + Some(&combined_matches[combined_matches.len() - 1].0), + ) +@@ -537,7 +547,7 @@ fn activate(app: >k::Application, runtime_data: Rc>) { + + // Move the selection based on the input, loops from top to bottom and vice versa + match event.keyval() { +- constants::Down | constants::Tab => { ++ constants::Down | constants::Tab | constants::n => { + if index < combined_matches.len() - 1 { + combined_matches[index + 1] + .1 +@@ -548,7 +558,7 @@ fn activate(app: >k::Application, runtime_data: Rc>) { + .select_row(Some(&combined_matches[0].0)); + } + } +- constants::Up => { ++ constants::Up | constants::p => { + if index > 0 { + combined_matches[index - 1] + .1 +@@ -565,7 +575,7 @@ fn activate(app: >k::Application, runtime_data: Rc>) { + Inhibit(true) + } + // Handle when the selected match is "activated" +- constants::Return => { ++ (_, constants::Return) => { + let mut _runtime_data_clone = runtime_data_clone.borrow_mut(); + + let (selected_match, plugin_view) = match _runtime_data_clone +diff --git a/flake.lock b/flake.lock +index c6d5079..18d7c5d 100644 +--- a/flake.lock ++++ b/flake.lock +@@ -7,11 +7,11 @@ + ] + }, + "locked": { +- "lastModified": 1696343447, +- "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", ++ "lastModified": 1706830856, ++ "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "owner": "hercules-ci", + "repo": "flake-parts", +- "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", ++ "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "type": "github" + }, + "original": { +@@ -22,11 +22,11 @@ + }, + "nixpkgs": { + "locked": { +- "lastModified": 1696193975, +- "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", ++ "lastModified": 1708118438, ++ "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", + "owner": "NixOS", + "repo": "nixpkgs", +- "rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242", ++ "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", + "type": "github" + }, + "original": { diff --git a/patches/nixneovim.patch b/patches/nixneovim.patch new file mode 100644 index 00000000..ad9eee54 --- /dev/null +++ b/patches/nixneovim.patch @@ -0,0 +1,24 @@ +diff --git a/src/plugins/_lspconfig-modules/servers.nix b/src/plugins/_lspconfig-modules/servers.nix +index f553364..3f235e9 100644 +--- a/src/plugins/_lspconfig-modules/servers.nix ++++ b/src/plugins/_lspconfig-modules/servers.nix +@@ -96,6 +96,9 @@ let + languages = "OCaml"; + packages = [ pkgs.ocamlPackages.ocaml-lsp ]; + }; ++ pylyzer = { ++ languages = "Python"; ++ }; + pyright = { + languages = "Python"; + }; +@@ -119,6 +122,9 @@ let + else + [ python3Packages.ruff-lsp ]; + }; ++ sqls = { ++ languages = "SQL"; ++ }; + taplo = { + languages = "TOML"; + packages = [ taplo ];