diff --git a/pkgs/by-name/sy/syncstorage-rs/Cargo.lock b/pkgs/by-name/sy/syncstorage-rs/Cargo.lock index 4f364aacbdd5..0f2d09898d68 100644 --- a/pkgs/by-name/sy/syncstorage-rs/Cargo.lock +++ b/pkgs/by-name/sy/syncstorage-rs/Cargo.lock @@ -609,17 +609,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "config" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3" -dependencies = [ - "lazy_static", - "nom 5.1.3", - "serde 1.0.203", -] - [[package]] name = "config" version = "0.11.0" @@ -686,15 +675,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "crossbeam-queue" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-utils" version = "0.8.20" @@ -778,14 +758,21 @@ dependencies = [ [[package]] name = "deadpool" -version = "0.7.0" -source = "git+https://github.com/mozilla-services/deadpool?tag=deadpool-v0.7.0#4e041037f758186e62021021e130926d5302ebe8" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6541a3916932fe57768d4be0b1ffb5ec7cbf74ca8c903fdfd5c0fe8aa958f0ed" dependencies = [ - "async-trait", - "config 0.10.1", - "crossbeam-queue", + "deadpool-runtime", "num_cpus", - "serde 1.0.203", + "tokio", +] + +[[package]] +name = "deadpool-runtime" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b" +dependencies = [ "tokio", ] @@ -1630,7 +1617,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -2820,7 +2807,7 @@ checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "syncserver" -version = "0.17.12" +version = "0.17.15" dependencies = [ "actix-cors", "actix-http", @@ -2875,7 +2862,7 @@ dependencies = [ [[package]] name = "syncserver-common" -version = "0.17.12" +version = "0.17.15" dependencies = [ "actix-web", "backtrace", @@ -2895,7 +2882,7 @@ dependencies = [ [[package]] name = "syncserver-db-common" -version = "0.17.12" +version = "0.17.15" dependencies = [ "backtrace", "deadpool", @@ -2909,9 +2896,9 @@ dependencies = [ [[package]] name = "syncserver-settings" -version = "0.17.12" +version = "0.17.15" dependencies = [ - "config 0.11.0", + "config", "num_cpus", "serde 1.0.203", "slog-scope", @@ -2923,7 +2910,7 @@ dependencies = [ [[package]] name = "syncstorage-db" -version = "0.17.12" +version = "0.17.15" dependencies = [ "async-trait", "cadence", @@ -2946,7 +2933,7 @@ dependencies = [ [[package]] name = "syncstorage-db-common" -version = "0.17.12" +version = "0.17.15" dependencies = [ "async-trait", "backtrace", @@ -2965,7 +2952,7 @@ dependencies = [ [[package]] name = "syncstorage-mysql" -version = "0.17.12" +version = "0.17.15" dependencies = [ "async-trait", "backtrace", @@ -2988,7 +2975,7 @@ dependencies = [ [[package]] name = "syncstorage-settings" -version = "0.17.12" +version = "0.17.15" dependencies = [ "rand", "serde 1.0.203", @@ -2998,7 +2985,7 @@ dependencies = [ [[package]] name = "syncstorage-spanner" -version = "0.17.12" +version = "0.17.15" dependencies = [ "async-trait", "backtrace", @@ -3142,7 +3129,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokenserver-auth" -version = "0.17.12" +version = "0.17.15" dependencies = [ "async-trait", "base64 0.22.1", @@ -3169,7 +3156,7 @@ dependencies = [ [[package]] name = "tokenserver-common" -version = "0.17.12" +version = "0.17.15" dependencies = [ "actix-web", "backtrace", @@ -3184,7 +3171,7 @@ dependencies = [ [[package]] name = "tokenserver-db" -version = "0.17.12" +version = "0.17.15" dependencies = [ "async-trait", "backtrace", @@ -3209,7 +3196,7 @@ dependencies = [ [[package]] name = "tokenserver-settings" -version = "0.17.12" +version = "0.17.15" dependencies = [ "jsonwebtoken", "serde 1.0.203", diff --git a/pkgs/by-name/sy/syncstorage-rs/package.nix b/pkgs/by-name/sy/syncstorage-rs/package.nix index 51dc44b14e34..fb8af72234cb 100644 --- a/pkgs/by-name/sy/syncstorage-rs/package.nix +++ b/pkgs/by-name/sy/syncstorage-rs/package.nix @@ -21,13 +21,13 @@ in rustPlatform.buildRustPackage rec { pname = "syncstorage-rs"; - version = "0.17.12"; + version = "0.17.15"; src = fetchFromGitHub { owner = "mozilla-services"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-hvKbKbRa5zk+80xmKWeMRjshaS6uybFzb5KdBY19Sl8="; + hash = "sha256-2o1QVDOgcVWvU0G8/dmVnxX4w5ZOZ9D8oh5GgO1ZpV0="; }; nativeBuildInputs = [ @@ -49,7 +49,6 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "deadpool-0.7.0" = "sha256-yQwn45EuzmPBwuT+iLJ/LLWAkBkW2vF+GLswdbpFVAY="; "sentry-0.34.0" = "sha256-BdWz6EIEm2YU3DG3ODkuXCVCMV6srdyx2gXkOxINjHc="; }; };