Merge pull request #261722 from anthonyroussel/ssm-agent-rename

amazon-ssm-agent: rename from ssm-agent
This commit is contained in:
Mario Rodas 2023-10-25 04:18:24 -05:00 committed by GitHub
commit 84a877ed30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 11 deletions

View File

@ -331,6 +331,8 @@
- `ps3netsrv` has been replaced with the webman-mod fork, the executable has been renamed from `ps3netsrv++` to `ps3netsrv` and cli parameters have changed.
- `ssm-agent` package and module were renamed to `amazon-ssm-agent` to be consistent with the upstream package name.
## Other Notable Changes {#sec-release-23.11-notable-changes}
- The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.

View File

@ -625,6 +625,7 @@
./services/matrix/matrix-sliding-sync.nix
./services/matrix/synapse.nix
./services/misc/airsonic.nix
./services/misc/amazon-ssm-agent.nix
./services/misc/ananicy.nix
./services/misc/ankisyncd.nix
./services/misc/apache-kafka.nix
@ -741,7 +742,6 @@
./services/misc/spice-autorandr.nix
./services/misc/spice-vdagentd.nix
./services/misc/spice-webdavd.nix
./services/misc/ssm-agent.nix
./services/misc/sssd.nix
./services/misc/subsonic.nix
./services/misc/sundtek.nix

View File

@ -2,7 +2,7 @@
with lib;
let
cfg = config.services.ssm-agent;
cfg = config.services.amazon-ssm-agent;
# The SSM agent doesn't pay attention to our /etc/os-release yet, and the lsb-release tool
# in nixpkgs doesn't seem to work properly on NixOS, so let's just fake the two fields SSM
@ -16,19 +16,24 @@ let
esac
'';
in {
options.services.ssm-agent = {
enable = mkEnableOption (lib.mdDoc "AWS SSM agent");
imports = [
(mkRenamedOptionModule [ "services" "ssm-agent" "enable" ] [ "services" "amazon-ssm-agent" "enable" ])
(mkRenamedOptionModule [ "services" "ssm-agent" "package" ] [ "services" "amazon-ssm-agent" "package" ])
];
options.services.amazon-ssm-agent = {
enable = mkEnableOption (lib.mdDoc "Amazon SSM agent");
package = mkOption {
type = types.path;
description = lib.mdDoc "The SSM agent package to use";
default = pkgs.ssm-agent.override { overrideEtc = false; };
defaultText = literalExpression "pkgs.ssm-agent.override { overrideEtc = false; }";
description = lib.mdDoc "The Amazon SSM agent package to use";
default = pkgs.amazon-ssm-agent.override { overrideEtc = false; };
defaultText = literalExpression "pkgs.amazon-ssm-agent.override { overrideEtc = false; }";
};
};
config = mkIf cfg.enable {
systemd.services.ssm-agent = {
systemd.services.amazon-ssm-agent = {
inherit (cfg.package.meta) description;
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];

View File

@ -11,7 +11,7 @@
, bashInteractive
, nix-update-script
, testers
, ssm-agent
, amazon-ssm-agent
, overrideEtc ? true
}:
@ -138,7 +138,7 @@ buildGoModule rec {
passthru = {
updateScript = nix-update-script { };
tests.version = testers.testVersion {
package = ssm-agent;
package = amazon-ssm-agent;
command = "amazon-ssm-agent --version";
};
};

View File

@ -850,6 +850,7 @@ mapAliases ({
spotify-unwrapped = spotify; # added 2022-11-06
spring-boot = spring-boot-cli; # added 2020-04-24
squid4 = throw "'squid4' has been renamed to/replaced by 'squid'"; # Converted to throw 2023-09-10
ssm-agent = amazon-ssm-agent; # Added 2023-10-17
starboard-octant-plugin = throw "starboard-octant-plugin has been dropped due to needing octant which is archived"; # Added 2023-09-29
steam-run-native = steam-run; # added 2022-02-21
sumneko-lua-language-server = lua-language-server; # Added 2023-02-07

View File

@ -18115,7 +18115,6 @@ with pkgs;
inherit (darwin) libobjc;
};
ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { };
ssm-session-manager-plugin = callPackage ../applications/networking/cluster/ssm-session-manager-plugin { };
starlark = callPackage ../development/interpreters/starlark { };