diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix
new file mode 100644
index 000000000000..0d7082f3f787
--- /dev/null
+++ b/pkgs/by-name/am/amazon-q-cli/package.nix
@@ -0,0 +1,73 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  protobuf_26,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "amazon-q-cli";
+  version = "1.7.2";
+
+  src = fetchFromGitHub {
+    owner = "aws";
+    repo = "amazon-q-developer-cli";
+    tag = "v${version}";
+    hash = "sha256-uKsj7QBKomkO1xP5VgOGI5W8CHIgPQx4QsS2voghrVc=";
+  };
+
+  useFetchCargoVendor = true;
+
+  cargoHash = "sha256-G99vb+7eomxDy9xFJjKA+KpCH2NUzitAKHZE5b62Db8=";
+
+  cargoBuildFlags = [
+    "-p"
+    "q_cli"
+  ];
+  cargoTestFlags = [
+    "-p"
+    "q_cli"
+  ];
+
+  # skip integration tests that have external dependencies
+  checkFlags = [
+    "--skip=cli::chat::tests::test_flow"
+    "--skip=cli::init::tests::test_prompts"
+    "--skip=debug_get_index"
+    "--skip=debug_list_intellij_variants"
+    "--skip=debug_refresh_auth_token"
+    "--skip=local_state_all"
+    "--skip=local_state_get"
+    "--skip=settings_all"
+    "--skip=settings_get"
+    "--skip=user_whoami"
+    "--skip=init_lint_bash_post_bash_profile"
+    "--skip=init_lint_bash_post_bashrc"
+    "--skip=init_lint_bash_pre_bash_profile"
+    "--skip=init_lint_bash_pre_bashrc"
+    "--skip=init_lint_fish_pre_00_fig_pre"
+    "--skip=init_lint_zsh_post_zprofile"
+    "--skip=init_lint_zsh_post_zshrc"
+    "--skip=init_lint_zsh_pre_zprofile"
+    "--skip=init_lint_zsh_pre_zshrc"
+  ];
+
+  nativeBuildInputs = [
+    protobuf_26
+  ];
+
+  postInstall = ''
+    mv $out/bin/q_cli $out/bin/amazon-q
+  '';
+
+  meta = {
+    description = "Amazon Q Developer AI coding agent CLI";
+    homepage = "https://github.com/aws/amazon-q-developer-cli";
+    license = with lib.licenses; [
+      mit
+      asl20
+    ];
+    maintainers = [ lib.maintainers.jamesward ];
+    platforms = lib.platforms.linux;
+  };
+}