nix-community/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-12-16 05:51:08 +01:00
Code Activity

syncthing: remove deprecated code

Browse source 
Specifically, in 2021 the use of `services.syncthing.tray` as a
Boolean was deprecated. This removes the associated code.
This commit is contained in:
Robert Helgesson 2025-09-25 08:43:39 +02:00
parent 74a78aacb7
commit ade850153b
No known key found for this signature in database
GPG key ID: 96E745BD17AA17ED
3 changed files with 22 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

86
modules/services/syncthing.nix
View file

@ -738,38 +738,28 @@ in
package = lib.mkPackageOption pkgs "syncthing" { }; package = lib.mkPackageOption pkgs "syncthing" { };
tray = mkOption { tray = {
type = enable = mkOption {
with types; type = types.bool;
either bool (submodule { default = false;
options = { description = "Whether to enable a syncthing tray service.";
enable = mkOption { };
type = bool;
default = false; command = mkOption {
description = "Whether to enable a syncthing tray service."; type = types.str;
}; default = "syncthingtray --wait";
defaultText = literalExpression "syncthingtray --wait";
command = mkOption { example = literalExpression "qsyncthingtray";
type = str; description = "Syncthing tray command to use.";
default = "syncthingtray --wait"; };
defaultText = literalExpression "syncthingtray --wait";
example = literalExpression "qsyncthingtray"; package = mkOption {
description = "Syncthing tray command to use."; type = types.package;
}; default = pkgs.syncthingtray-minimal;
defaultText = literalExpression "pkgs.syncthingtray-minimal";
package = mkOption { example = literalExpression "pkgs.qsyncthingtray";
type = package; description = "Syncthing tray package to use.";
default = pkgs.syncthingtray-minimal;
defaultText = literalExpression "pkgs.syncthingtray-minimal";
example = literalExpression "pkgs.qsyncthingtray";
description = "Syncthing tray package to use.";
};
};
});
default = {
enable = false;
}; };
description = "Syncthing tray service configuration.";
}; };
}; };
}; };
@ -871,7 +861,7 @@ in
}; };
}) })
(lib.mkIf (lib.isAttrs cfg.tray && cfg.tray.enable) { (lib.mkIf cfg.tray.enable {
assertions = [ assertions = [
(lib.hm.assertions.assertPlatform "services.syncthing.tray" pkgs lib.platforms.linux) (lib.hm.assertions.assertPlatform "services.syncthing.tray" pkgs lib.platforms.linux)
]; ];
@ -898,37 +888,5 @@ in
}; };
}; };
}) })
# deprecated
(lib.mkIf (lib.isBool cfg.tray && cfg.tray) {
assertions = [
(lib.hm.assertions.assertPlatform "services.syncthing.tray" pkgs lib.platforms.linux)
];
systemd.user.services = {
"syncthingtray" = {
Unit = {
Description = "syncthingtray";
Requires = [ "tray.target" ];
After = [
"graphical-session.target"
"tray.target"
];
PartOf = [ "graphical-session.target" ];
};
Service = {
ExecStart = "${pkgs.syncthingtray-minimal}/bin/syncthingtray --wait";
};
Install = {
WantedBy = [ "graphical-session.target" ];
};
};
};
warnings = [
"Specifying 'services.syncthing.tray' as a boolean is deprecated, set 'services.syncthing.tray.enable' instead. See https://github.com/nix-community/home-manager/pull/1257."
];
})
]; ];
} }

1
tests/modules/services/syncthing/linux/default.nix
View file

@ -1,4 +1,3 @@
{ {
syncthing-tray = ./tray.nix; syncthing-tray = ./tray.nix;
syncthing-tray-as-bool-triggers-warning = ./tray-as-bool-triggers-warning.nix;
} }

11
tests/modules/services/syncthing/linux/tray-as-bool-triggers-warning.nix
View file

@ -1,11 +0,0 @@
{
services.syncthing.tray = true;
test.asserts.warnings.expected = [
"Specifying 'services.syncthing.tray' as a boolean is deprecated, set 'services.syncthing.tray.enable' instead. See https://github.com/nix-community/home-manager/pull/1257."
];
nmt.script = ''
assertFileExists home-files/.config/systemd/user/syncthingtray.service
'';
}