diff options
author | pennae <github@quasiparticle.net> | 2022-12-19 12:09:25 +0100 |
---|---|---|
committer | pennae <82953136+pennae@users.noreply.github.com> | 2022-12-21 10:29:25 +0100 |
commit | 13d725908cf96edcb1527bbfbb238f566fc31b51 (patch) | |
tree | 83352dd8d4531e7fe894efe1422795e104415bd2 | |
parent | 0776b54a89aaac95fc9881b37ad061bf07b29c60 (diff) |
syncstorage-rs: 0.12.5 -> 0.13.1
this includes a module update because the package update breaks the
module. would rather not break system bisection if possible.
-rw-r--r-- | nixos/modules/services/networking/firefox-syncserver.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/syncstorage-rs/default.nix | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/nixos/modules/services/networking/firefox-syncserver.nix b/nixos/modules/services/networking/firefox-syncserver.nix index c3d9f43f7457..d9e42ab7aea3 100644 --- a/nixos/modules/services/networking/firefox-syncserver.nix +++ b/nixos/modules/services/networking/firefox-syncserver.nix @@ -11,8 +11,10 @@ let format = pkgs.formats.toml {}; settings = { - database_url = dbURL; human_logs = true; + syncstorage = { + database_url = dbURL; + }; tokenserver = { node_type = "mysql"; database_url = dbURL; @@ -253,7 +255,7 @@ in serviceConfig = { User = defaultUser; Group = defaultUser; - ExecStart = "${cfg.package}/bin/syncstorage --config ${configFile}"; + ExecStart = "${cfg.package}/bin/syncserver --config ${configFile}"; Stderr = "journal"; EnvironmentFile = lib.mkIf (cfg.secrets != null) "${cfg.secrets}"; diff --git a/pkgs/servers/syncstorage-rs/default.nix b/pkgs/servers/syncstorage-rs/default.nix index e0b836ae851d..3c8e0f4caea0 100644 --- a/pkgs/servers/syncstorage-rs/default.nix +++ b/pkgs/servers/syncstorage-rs/default.nix @@ -21,13 +21,13 @@ in rustPlatform.buildRustPackage rec { pname = "syncstorage-rs"; - version = "0.12.5"; + version = "0.13.1"; src = fetchFromGitHub { owner = "mozilla-services"; repo = pname; rev = version; - hash = "sha256-rayJvJ8+y1mw2BEKuaZqGnsIqtVKgBoFkINntRLtTLs="; + hash = "sha256-aRLTuP5He8rHsi4Qw+CptyGhp2JdQwL/jLNmHUPcYBU="; }; nativeBuildInputs = [ @@ -43,11 +43,11 @@ rustPlatform.buildRustPackage rec { ]; preFixup = '' - wrapProgram $out/bin/syncstorage \ + wrapProgram $out/bin/syncserver \ --prefix PATH : ${lib.makeBinPath [ pyFxADeps ]} ''; - cargoSha256 = "sha256-FUWyR2mfXHyQ/WdyyV4/pIniBV9pr80WwpFA4c8D1UY="; + cargoSha256 = "sha256-95wK0jFbuu1xFacOAJFAQitm/tlvMUIny2As49QukQE="; buildFeatures = [ "grpcio/openssl" ]; |