From ece1914240e2d2625e1dc45ed2d4a2485ee8d86a Mon Sep 17 00:00:00 2001 From: aktaboot Date: Sat, 19 Oct 2024 22:30:20 +0200 Subject: [PATCH 1/2] syncstorage-rs: 0.17.9 -> 0.17.12 https://github.com/mozilla-services/syncstorage-rs/releases --- pkgs/by-name/sy/syncstorage-rs/Cargo.lock | 47 +++++++++------------- pkgs/by-name/sy/syncstorage-rs/package.nix | 5 ++- 2 files changed, 23 insertions(+), 29 deletions(-) diff --git a/pkgs/by-name/sy/syncstorage-rs/Cargo.lock b/pkgs/by-name/sy/syncstorage-rs/Cargo.lock index 4333f1d26fbb..4f364aacbdd5 100644 --- a/pkgs/by-name/sy/syncstorage-rs/Cargo.lock +++ b/pkgs/by-name/sy/syncstorage-rs/Cargo.lock @@ -2458,8 +2458,7 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "sentry" version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5484316556650182f03b43d4c746ce0e3e48074a21e2f51244b648b6542e1066" +source = "git+https://github.com/getsentry/sentry-rust?rev=1b65b5c#1b65b5c99af975496880e7325218479e0037d097" dependencies = [ "curl", "httpdate", @@ -2473,8 +2472,7 @@ dependencies = [ [[package]] name = "sentry-backtrace" version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40aa225bb41e2ec9d7c90886834367f560efc1af028f1c5478a6cce6a59c463a" +source = "git+https://github.com/getsentry/sentry-rust?rev=1b65b5c#1b65b5c99af975496880e7325218479e0037d097" dependencies = [ "backtrace", "once_cell", @@ -2485,8 +2483,7 @@ dependencies = [ [[package]] name = "sentry-contexts" version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a8dd746da3d16cb8c39751619cefd4fcdbd6df9610f3310fd646b55f6e39910" +source = "git+https://github.com/getsentry/sentry-rust?rev=1b65b5c#1b65b5c99af975496880e7325218479e0037d097" dependencies = [ "hostname", "libc", @@ -2499,8 +2496,7 @@ dependencies = [ [[package]] name = "sentry-core" version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "161283cfe8e99c8f6f236a402b9ccf726b201f365988b5bb637ebca0abbd4a30" +source = "git+https://github.com/getsentry/sentry-rust?rev=1b65b5c#1b65b5c99af975496880e7325218479e0037d097" dependencies = [ "once_cell", "rand", @@ -2512,8 +2508,7 @@ dependencies = [ [[package]] name = "sentry-debug-images" version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc6b25e945fcaa5e97c43faee0267eebda9f18d4b09a251775d8fef1086238a" +source = "git+https://github.com/getsentry/sentry-rust?rev=1b65b5c#1b65b5c99af975496880e7325218479e0037d097" dependencies = [ "findshlibs", "once_cell", @@ -2523,8 +2518,7 @@ dependencies = [ [[package]] name = "sentry-tracing" version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3c5faf2103cd01eeda779ea439b68c4ee15adcdb16600836e97feafab362ec" +source = "git+https://github.com/getsentry/sentry-rust?rev=1b65b5c#1b65b5c99af975496880e7325218479e0037d097" dependencies = [ "sentry-backtrace", "sentry-core", @@ -2535,8 +2529,7 @@ dependencies = [ [[package]] name = "sentry-types" version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d68cdf6bc41b8ff3ae2a9c4671e97426dcdd154cc1d4b6b72813f285d6b163f" +source = "git+https://github.com/getsentry/sentry-rust?rev=1b65b5c#1b65b5c99af975496880e7325218479e0037d097" dependencies = [ "debugid", "hex", @@ -2827,7 +2820,7 @@ checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "syncserver" -version = "0.17.9" +version = "0.17.12" dependencies = [ "actix-cors", "actix-http", @@ -2882,7 +2875,7 @@ dependencies = [ [[package]] name = "syncserver-common" -version = "0.17.9" +version = "0.17.12" dependencies = [ "actix-web", "backtrace", @@ -2902,7 +2895,7 @@ dependencies = [ [[package]] name = "syncserver-db-common" -version = "0.17.9" +version = "0.17.12" dependencies = [ "backtrace", "deadpool", @@ -2916,7 +2909,7 @@ dependencies = [ [[package]] name = "syncserver-settings" -version = "0.17.9" +version = "0.17.12" dependencies = [ "config 0.11.0", "num_cpus", @@ -2930,7 +2923,7 @@ dependencies = [ [[package]] name = "syncstorage-db" -version = "0.17.9" +version = "0.17.12" dependencies = [ "async-trait", "cadence", @@ -2953,7 +2946,7 @@ dependencies = [ [[package]] name = "syncstorage-db-common" -version = "0.17.9" +version = "0.17.12" dependencies = [ "async-trait", "backtrace", @@ -2972,7 +2965,7 @@ dependencies = [ [[package]] name = "syncstorage-mysql" -version = "0.17.9" +version = "0.17.12" dependencies = [ "async-trait", "backtrace", @@ -2995,7 +2988,7 @@ dependencies = [ [[package]] name = "syncstorage-settings" -version = "0.17.9" +version = "0.17.12" dependencies = [ "rand", "serde 1.0.203", @@ -3005,7 +2998,7 @@ dependencies = [ [[package]] name = "syncstorage-spanner" -version = "0.17.9" +version = "0.17.12" dependencies = [ "async-trait", "backtrace", @@ -3149,7 +3142,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokenserver-auth" -version = "0.17.9" +version = "0.17.12" dependencies = [ "async-trait", "base64 0.22.1", @@ -3176,7 +3169,7 @@ dependencies = [ [[package]] name = "tokenserver-common" -version = "0.17.9" +version = "0.17.12" dependencies = [ "actix-web", "backtrace", @@ -3191,7 +3184,7 @@ dependencies = [ [[package]] name = "tokenserver-db" -version = "0.17.9" +version = "0.17.12" dependencies = [ "async-trait", "backtrace", @@ -3216,7 +3209,7 @@ dependencies = [ [[package]] name = "tokenserver-settings" -version = "0.17.9" +version = "0.17.12" 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 4c24a889afd0..be1765ce034a 100644 --- a/pkgs/by-name/sy/syncstorage-rs/package.nix +++ b/pkgs/by-name/sy/syncstorage-rs/package.nix @@ -20,13 +20,13 @@ in rustPlatform.buildRustPackage rec { pname = "syncstorage-rs"; - version = "0.17.9"; + version = "0.17.12"; src = fetchFromGitHub { owner = "mozilla-services"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ezTwAAtt0/jKfA6FtvzuQVFYOODMcD4RFiU3x0Umifk="; + hash = "sha256-hvKbKbRa5zk+80xmKWeMRjshaS6uybFzb5KdBY19Sl8="; }; nativeBuildInputs = [ @@ -49,6 +49,7 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; outputHashes = { "deadpool-0.7.0" = "sha256-yQwn45EuzmPBwuT+iLJ/LLWAkBkW2vF+GLswdbpFVAY="; + "sentry-0.34.0" = "sha256-BdWz6EIEm2YU3DG3ODkuXCVCMV6srdyx2gXkOxINjHc="; }; }; From d2c9de5e7c2f48328a5817a1cb8e6dab4adfbf94 Mon Sep 17 00:00:00 2001 From: aktaboot Date: Mon, 21 Oct 2024 14:04:26 +0200 Subject: [PATCH 2/2] syncstorage-rs: add passthru.updateScript --- pkgs/by-name/sy/syncstorage-rs/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/sy/syncstorage-rs/package.nix b/pkgs/by-name/sy/syncstorage-rs/package.nix index be1765ce034a..51dc44b14e34 100644 --- a/pkgs/by-name/sy/syncstorage-rs/package.nix +++ b/pkgs/by-name/sy/syncstorage-rs/package.nix @@ -6,6 +6,7 @@ , libmysqlclient , makeBinaryWrapper , lib +, nix-update-script }: let @@ -56,6 +57,8 @@ rustPlatform.buildRustPackage rec { # almost all tests need a DB to test against doCheck = false; + passthru.updateScript = nix-update-script {}; + meta = { description = "Mozilla Sync Storage built with Rust"; homepage = "https://github.com/mozilla-services/syncstorage-rs";