syncstorage-rs: split into syncstorage-rs-{mysql,pgsql}

Expose both database backends as top-level packages so Hydra builds
and caches each variant. The firefox-syncserver module now picks the
appropriate package based on `services.firefox-syncserver.database.type`
when the user does not supply one explicitly.

The `package` option becomes `nullOr package` with a `null` default;
this avoids requiring a user-supplied custom package to implement the
`dbBackend` override attribute.

Author: Titaniumtown

nixos/modules/services/networking/firefox-syncserver.nix

@@ -30,7 +30,13 @@ let
   # where the syncserver starts before its database and role exist.
   dbService = if dbIsMySQL then "mysql.service" else "postgresql.target";
 
-  syncserver = cfg.package.override { dbBackend = cfg.database.type; };
+  syncserver =
+    if cfg.package != null then
+      cfg.package
+    else if dbIsMySQL then
+      pkgs.syncstorage-rs-mysql
+    else
+      pkgs.syncstorage-rs-pgsql;
 
   format = pkgs.formats.toml { };
   settings = {
@@ -149,7 +155,20 @@ in
         {option}`${opt.singleNode.enable}` does this automatically when enabled
       '';
 
-      package = lib.mkPackageOption pkgs "syncstorage-rs" { };
+      package = lib.mkOption {
+        type = lib.types.nullOr lib.types.package;
+        default = null;
+        defaultText = lib.literalExpression ''
+          if config.${opt.database.type} == "mysql" then
+            pkgs.syncstorage-rs-mysql
+          else
+            pkgs.syncstorage-rs-pgsql
+        '';
+        description = ''
+          Syncstorage server package to use. When `null`, the package is
+          selected automatically based on {option}`${opt.database.type}`.
+        '';
+      };
 
       database.type = lib.mkOption {
         type = lib.types.enum [

pkgs/by-name/sy/syncstorage-rs/package.nix

@@ -35,6 +35,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pname = "syncstorage-rs";
   version = "0.22.2";
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "mozilla-services";
     repo = "syncstorage-rs";
@@ -86,7 +88,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   passthru.updateScript = nix-update-script { };
 
-  passthru.tests = { inherit (nixosTests) firefox-syncserver; };
+  passthru.tests = {
+    firefox-syncserver =
+      nixosTests.firefox-syncserver.${if dbBackend == "postgresql" then "postgresql" else "mysql"};
+  };
 
   meta = {
     description = "Mozilla Sync Storage built with Rust";

pkgs/top-level/all-packages.nix

@@ -9461,6 +9461,13 @@ with pkgs;
     waylandSupport = true;
   };
 
+  syncstorage-rs-mysql = callPackage ../by-name/sy/syncstorage-rs/package.nix {
+    dbBackend = "mysql";
+  };
+  syncstorage-rs-pgsql = callPackage ../by-name/sy/syncstorage-rs/package.nix {
+    dbBackend = "postgresql";
+  };
+
   synergyWithoutGUI = synergy.override { withGUI = false; };
 
   tabbed = callPackage ../applications/window-managers/tabbed {