diff --git a/Cargo.lock b/Cargo.lock index debb337..9113290 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "Inflector" @@ -1824,8 +1824,9 @@ dependencies = [ [[package]] name = "rosu-pp" -version = "1.1.0" -source = "git+https://github.com/MaxOhn/rosu-pp?branch=main#9f45d9594d08ba79d3c1c73ec43aef2fd7b54c0d" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f62afdb7d6eb23f73057d4c0e38ee842bb653ffa702ef3218ca69776e45ddc1" dependencies = [ "rosu-map 0.2.0", "rosu-mods", @@ -1834,7 +1835,7 @@ dependencies = [ [[package]] name = "rosu-v2" version = "0.9.0" -source = "git+https://github.com/MaxOhn/rosu-v2?branch=lazer#4552ffa6e4e8d375c4a6f0a4cc2d21c4f61a129f" +source = "git+https://github.com/MaxOhn/rosu-v2?branch=lazer#95c92fc1f263766d337e2e0f04a46c97b16cfd3c" dependencies = [ "bytes", "dashmap 6.0.1", @@ -2568,9 +2569,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -2589,9 +2590,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ "num-conv", "time-core", diff --git a/flake.lock b/flake.lock index 5898f6d..4455cdf 100644 --- a/flake.lock +++ b/flake.lock @@ -1,17 +1,12 @@ { "nodes": { "crane": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, "locked": { - "lastModified": 1724377159, - "narHash": "sha256-ixjje1JO8ucKT41hs6n2NCde1Vc0+Zc2p2gUbJpCsMw=", + "lastModified": 1734744351, + "narHash": "sha256-fN9npuZHHHzDVr1wuKoh/TheHkerDaLB9l4vj/48Exg=", "owner": "ipetkov", "repo": "crane", - "rev": "3e47b7a86c19142bd3675da49d6acef488b4dac1", + "rev": "a83a48a62640517588c3d137c948ed034706363c", "type": "github" }, "original": { @@ -25,11 +20,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -40,11 +35,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724224976, - "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -69,11 +64,11 @@ ] }, "locked": { - "lastModified": 1724466314, - "narHash": "sha256-ltKuK6shQ64uej1mYNtBsDYxttUNFiv9AcHqk0+0NQM=", + "lastModified": 1734747996, + "narHash": "sha256-0DUuObdcPITVOMMymq2y6YlM++QEWXZO3cTm6RGYgL8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2b5b3edd96ef336b00622dcabc13788fdef9e3ca", + "rev": "f9086701f5f3d36b8e5f4a3b9c93579ebc2581e6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 57376be..06a1d10 100644 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,7 @@ description = "A discord bot for Dự Tuyển Tổng Hợp server"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - crane = { - url = "github:ipetkov/crane"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + crane.url = "github:ipetkov/crane"; flake-utils.url = "github:numtide/flake-utils"; rust-overlay = { url = "github:oxalica/rust-overlay"; @@ -23,7 +20,7 @@ { inherit system; overlays = [ (import inputs.rust-overlay) ]; }; - craneLib = (inputs.crane.mkLib pkgs).overrideToolchain (p: p.rust-bin.stable."1.79.0".default); + craneLib = (inputs.crane.mkLib pkgs).overrideToolchain (p: p.rust-bin.stable."1.83.0".default); # craneLib = inputs.crane.mkLib pkgs; in rec { diff --git a/youmubot-osu/Cargo.toml b/youmubot-osu/Cargo.toml index 70b5e0b..0d34085 100644 --- a/youmubot-osu/Cargo.toml +++ b/youmubot-osu/Cargo.toml @@ -14,7 +14,7 @@ dashmap = "5.3.4" lazy_static = "1.4.0" regex = "1.5.6" reqwest = "0.11.10" -rosu-pp = { git = "https://github.com/MaxOhn/rosu-pp", branch = "main" } +rosu-pp = "2.0.0" rosu-v2 = { git = "https://github.com/MaxOhn/rosu-v2", branch = "lazer" } rosu-map = "0.1" time = "0.3"