b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

syncstorage-rs: 0.12.5 -> 0.13.1

Browse source 
this includes a module update because the package update breaks the
module. would rather not break system bisection if possible.
This commit is contained in:
pennae 2022-12-19 12:09:25 +01:00 committed by pennae
parent 0776b54a89
commit 13d725908c
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/services/networking/firefox-syncserver.nix
View file

@ -11,8 +11,10 @@ let
format = pkgs.formats.toml {}; format = pkgs.formats.toml {};
settings = { settings = {
database_url = dbURL;
human_logs = true; human_logs = true;
syncstorage = {
database_url = dbURL;
};
tokenserver = { tokenserver = {
node_type = "mysql"; node_type = "mysql";
database_url = dbURL; database_url = dbURL;
@ -253,7 +255,7 @@ in
serviceConfig = { serviceConfig = {
User = defaultUser; User = defaultUser;
Group = defaultUser; Group = defaultUser;
ExecStart = "${cfg.package}/bin/syncstorage --config ${configFile}"; ExecStart = "${cfg.package}/bin/syncserver --config ${configFile}";
Stderr = "journal"; Stderr = "journal";
EnvironmentFile = lib.mkIf (cfg.secrets != null) "${cfg.secrets}"; EnvironmentFile = lib.mkIf (cfg.secrets != null) "${cfg.secrets}";

8
pkgs/servers/syncstorage-rs/default.nix
View file

@ -21,13 +21,13 @@ in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "syncstorage-rs"; pname = "syncstorage-rs";
version = "0.12.5"; version = "0.13.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mozilla-services"; owner = "mozilla-services";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-rayJvJ8+y1mw2BEKuaZqGnsIqtVKgBoFkINntRLtTLs="; hash = "sha256-aRLTuP5He8rHsi4Qw+CptyGhp2JdQwL/jLNmHUPcYBU=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -43,11 +43,11 @@ rustPlatform.buildRustPackage rec {
]; ];
preFixup = '' preFixup = ''
wrapProgram $out/bin/syncstorage \ wrapProgram $out/bin/syncserver \
--prefix PATH : ${lib.makeBinPath [ pyFxADeps ]} --prefix PATH : ${lib.makeBinPath [ pyFxADeps ]}
''; '';
cargoSha256 = "sha256-FUWyR2mfXHyQ/WdyyV4/pIniBV9pr80WwpFA4c8D1UY="; cargoSha256 = "sha256-95wK0jFbuu1xFacOAJFAQitm/tlvMUIny2As49QukQE=";
buildFeatures = [ "grpcio/openssl" ]; buildFeatures = [ "grpcio/openssl" ];