From a02ff694bec1c4764d123bcb7c38e35790679f0e Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 14 Nov 2023 08:54:09 +0100 Subject: [PATCH 1/2] amazon-ssm-agent: 3.2.1705.0 -> 3.2.1798.0 https://github.com/aws/amazon-ssm-agent/releases/tag/3.2.1798.0 https://github.com/aws/amazon-ssm-agent/compare/3.2.1705.0...3.2.1798.0 --- pkgs/by-name/am/amazon-ssm-agent/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix index 7a0efbdab623..42318be05baf 100644 --- a/pkgs/by-name/am/amazon-ssm-agent/package.nix +++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -40,13 +40,13 @@ let in buildGoModule rec { pname = "amazon-ssm-agent"; - version = "3.2.1705.0"; + version = "3.2.1798.0"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-ssm-agent"; rev = "refs/tags/${version}"; - hash = "sha256-4KhDD5G/fS1rHitQdbYqIz6RSQ3PTMZsUENC202a/Do="; + hash = "sha256-A7M8UbOJT9zvbcwlARMwA7a+LGk8KYmo9j31yzh5FDQ="; }; vendorHash = null; @@ -137,7 +137,8 @@ buildGoModule rec { ]; postFixup = '' - wrapProgram $out/bin/amazon-ssm-agent --prefix PATH : ${bashInteractive}/bin + wrapProgram $out/bin/amazon-ssm-agent \ + --prefix PATH : "${lib.makeBinPath [ bashInteractive ]}" ''; passthru = { From f263c60908265008e3799d605bc2d7e08bfebe04 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 14 Nov 2023 09:08:38 +0100 Subject: [PATCH 2/2] amazon-ssm-agent: add darwin support --- pkgs/by-name/am/amazon-ssm-agent/package.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix index 42318be05baf..a6a8a690d538 100644 --- a/pkgs/by-name/am/amazon-ssm-agent/package.nix +++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -2,6 +2,7 @@ , writeShellScriptBin , buildGoModule , makeWrapper +, darwin , fetchFromGitHub , coreutils , nettools @@ -60,7 +61,11 @@ buildGoModule rec { ./0002-version-gen-don-t-use-unnecessary-constants.patch ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + ] ++ lib.optionals stdenv.isDarwin [ + darwin.DarwinTools + ]; # See the list https://github.com/aws/amazon-ssm-agent/blob/3.2.1630.0/makefile#L120-L138 # The updater is not built because it cannot work on NixOS @@ -149,6 +154,8 @@ buildGoModule rec { }; }; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Agent to enable remote management of your Amazon EC2 instance configuration"; changelog = "https://github.com/aws/amazon-ssm-agent/releases/tag/${version}"; @@ -156,8 +163,5 @@ buildGoModule rec { license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ copumpkin manveru anthonyroussel ]; - - # Darwin support is broken - broken = stdenv.isDarwin; }; }