amazon-ssm-agent: rename from ssm-agent

+18 -11
+2
nixos/doc/manual/release-notes/rl-2311.section.md
··· 325 326 - `ps3netsrv` has been replaced with the webman-mod fork, the executable has been renamed from `ps3netsrv++` to `ps3netsrv` and cli parameters have changed. 327 328 ## Other Notable Changes {#sec-release-23.11-notable-changes} 329 330 - 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.
··· 325 326 - `ps3netsrv` has been replaced with the webman-mod fork, the executable has been renamed from `ps3netsrv++` to `ps3netsrv` and cli parameters have changed. 327 328 + - `ssm-agent` package and module were renamed to `amazon-ssm-agent` to be consistent with the upstream package name. 329 + 330 ## Other Notable Changes {#sec-release-23.11-notable-changes} 331 332 - 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.
+1 -1
nixos/modules/module-list.nix
··· 625 ./services/matrix/matrix-sliding-sync.nix 626 ./services/matrix/synapse.nix 627 ./services/misc/airsonic.nix 628 ./services/misc/ananicy.nix 629 ./services/misc/ankisyncd.nix 630 ./services/misc/apache-kafka.nix ··· 741 ./services/misc/spice-autorandr.nix 742 ./services/misc/spice-vdagentd.nix 743 ./services/misc/spice-webdavd.nix 744 - ./services/misc/ssm-agent.nix 745 ./services/misc/sssd.nix 746 ./services/misc/subsonic.nix 747 ./services/misc/sundtek.nix
··· 625 ./services/matrix/matrix-sliding-sync.nix 626 ./services/matrix/synapse.nix 627 ./services/misc/airsonic.nix 628 + ./services/misc/amazon-ssm-agent.nix 629 ./services/misc/ananicy.nix 630 ./services/misc/ankisyncd.nix 631 ./services/misc/apache-kafka.nix ··· 742 ./services/misc/spice-autorandr.nix 743 ./services/misc/spice-vdagentd.nix 744 ./services/misc/spice-webdavd.nix 745 ./services/misc/sssd.nix 746 ./services/misc/subsonic.nix 747 ./services/misc/sundtek.nix
+12 -7
nixos/modules/services/misc/ssm-agent.nix nixos/modules/services/misc/amazon-ssm-agent.nix
··· 2 3 with lib; 4 let 5 - cfg = config.services.ssm-agent; 6 7 # The SSM agent doesn't pay attention to our /etc/os-release yet, and the lsb-release tool 8 # in nixpkgs doesn't seem to work properly on NixOS, so let's just fake the two fields SSM ··· 16 esac 17 ''; 18 in { 19 - options.services.ssm-agent = { 20 - enable = mkEnableOption (lib.mdDoc "AWS SSM agent"); 21 22 package = mkOption { 23 type = types.path; 24 - description = lib.mdDoc "The SSM agent package to use"; 25 - default = pkgs.ssm-agent.override { overrideEtc = false; }; 26 - defaultText = literalExpression "pkgs.ssm-agent.override { overrideEtc = false; }"; 27 }; 28 }; 29 30 config = mkIf cfg.enable { 31 - systemd.services.ssm-agent = { 32 inherit (cfg.package.meta) description; 33 after = [ "network.target" ]; 34 wantedBy = [ "multi-user.target" ];
··· 2 3 with lib; 4 let 5 + cfg = config.services.amazon-ssm-agent; 6 7 # The SSM agent doesn't pay attention to our /etc/os-release yet, and the lsb-release tool 8 # in nixpkgs doesn't seem to work properly on NixOS, so let's just fake the two fields SSM ··· 16 esac 17 ''; 18 in { 19 + imports = [ 20 + (mkRenamedOptionModule [ "services" "ssm-agent" "enable" ] [ "services" "amazon-ssm-agent" "enable" ]) 21 + (mkRenamedOptionModule [ "services" "ssm-agent" "package" ] [ "services" "amazon-ssm-agent" "package" ]) 22 + ]; 23 + 24 + options.services.amazon-ssm-agent = { 25 + enable = mkEnableOption (lib.mdDoc "Amazon SSM agent"); 26 27 package = mkOption { 28 type = types.path; 29 + description = lib.mdDoc "The Amazon SSM agent package to use"; 30 + default = pkgs.amazon-ssm-agent.override { overrideEtc = false; }; 31 + defaultText = literalExpression "pkgs.amazon-ssm-agent.override { overrideEtc = false; }"; 32 }; 33 }; 34 35 config = mkIf cfg.enable { 36 + systemd.services.amazon-ssm-agent = { 37 inherit (cfg.package.meta) description; 38 after = [ "network.target" ]; 39 wantedBy = [ "multi-user.target" ];
pkgs/applications/networking/cluster/ssm-agent/0001-Disable-NIC-tests-that-fail-in-the-Nix-sandbox.patch pkgs/by-name/am/amazon-ssm-agent/0001-Disable-NIC-tests-that-fail-in-the-Nix-sandbox.patch
pkgs/applications/networking/cluster/ssm-agent/0002-version-gen-don-t-use-unnecessary-constants.patch pkgs/by-name/am/amazon-ssm-agent/0002-version-gen-don-t-use-unnecessary-constants.patch
+2 -2
pkgs/applications/networking/cluster/ssm-agent/default.nix pkgs/by-name/am/amazon-ssm-agent/package.nix
··· 11 , bashInteractive 12 , nix-update-script 13 , testers 14 - , ssm-agent 15 , overrideEtc ? true 16 }: 17 ··· 138 passthru = { 139 updateScript = nix-update-script { }; 140 tests.version = testers.testVersion { 141 - package = ssm-agent; 142 command = "amazon-ssm-agent --version"; 143 }; 144 };
··· 11 , bashInteractive 12 , nix-update-script 13 , testers 14 + , amazon-ssm-agent 15 , overrideEtc ? true 16 }: 17 ··· 138 passthru = { 139 updateScript = nix-update-script { }; 140 tests.version = testers.testVersion { 141 + package = amazon-ssm-agent; 142 command = "amazon-ssm-agent --version"; 143 }; 144 };
+1
pkgs/top-level/aliases.nix
··· 849 spotify-unwrapped = spotify; # added 2022-11-06 850 spring-boot = spring-boot-cli; # added 2020-04-24 851 squid4 = throw "'squid4' has been renamed to/replaced by 'squid'"; # Converted to throw 2023-09-10 852 starboard-octant-plugin = throw "starboard-octant-plugin has been dropped due to needing octant which is archived"; # Added 2023-09-29 853 steam-run-native = steam-run; # added 2022-02-21 854 sumneko-lua-language-server = lua-language-server; # Added 2023-02-07
··· 849 spotify-unwrapped = spotify; # added 2022-11-06 850 spring-boot = spring-boot-cli; # added 2020-04-24 851 squid4 = throw "'squid4' has been renamed to/replaced by 'squid'"; # Converted to throw 2023-09-10 852 + ssm-agent = amazon-ssm-agent; # Added 2023-10-17 853 starboard-octant-plugin = throw "starboard-octant-plugin has been dropped due to needing octant which is archived"; # Added 2023-09-29 854 steam-run-native = steam-run; # added 2022-02-21 855 sumneko-lua-language-server = lua-language-server; # Added 2023-02-07
-1
pkgs/top-level/all-packages.nix
··· 18134 inherit (darwin) libobjc; 18135 }; 18136 18137 - ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; 18138 ssm-session-manager-plugin = callPackage ../applications/networking/cluster/ssm-session-manager-plugin { }; 18139 18140 starlark = callPackage ../development/interpreters/starlark { };
··· 18134 inherit (darwin) libobjc; 18135 }; 18136 18137 ssm-session-manager-plugin = callPackage ../applications/networking/cluster/ssm-session-manager-plugin { }; 18138 18139 starlark = callPackage ../development/interpreters/starlark { };