From 0ec3b2c9524c3fa599e3b1e2553e363e6db90bf1 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 6 May 2025 09:52:26 +0200
Subject: [PATCH 1/3] amazon-q-cli: 1.8.0 -> 1.9.1

---
 pkgs/by-name/am/amazon-q-cli/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix
index fb941a20c72e..6ca3ba1d0494 100644
--- a/pkgs/by-name/am/amazon-q-cli/package.nix
+++ b/pkgs/by-name/am/amazon-q-cli/package.nix
@@ -7,18 +7,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "amazon-q-cli";
-  version = "1.8.0";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-q-developer-cli";
     tag = "v${version}";
-    hash = "sha256-fOz9oz+xNwX2Bzl6szgQ9oai6lqP+EzbaCNzHPUT2cA=";
+    hash = "sha256-BiVCiMBL5LLm8RYw58u6P7yqQq9XnN8b6fTbxNE2QsA=";
   };
 
   useFetchCargoVendor = true;
 
-  cargoHash = "sha256-H9bCke3vQDuS6RDEg8dzeFiBWCex64A8KSRhfgyp8e8=";
+  cargoHash = "sha256-7zUgWLGTZx3Ex7RYxb3eZimWdy6AxkNwpCDUwiAr2JE=";
 
   cargoBuildFlags = [
     "-p"
@@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec {
   ];
 
   postInstall = ''
-    mv $out/bin/q_cli $out/bin/amazon-q
+    install -m 0755 $out/bin/q_cli $out/bin/amazon-q
   '';
 
   meta = {
@@ -67,6 +67,7 @@ rustPlatform.buildRustPackage rec {
       mit
       asl20
     ];
+    mainProgram = "amazon-q";
     maintainers = [ lib.maintainers.jamesward ];
     platforms = lib.platforms.linux;
   };

From 33bac1c2ccca63b568b307d968a87b4b5b2e4435 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 6 May 2025 10:20:41 +0200
Subject: [PATCH 2/3] amazon-q-cli: use `finalAttrs` pattern

---
 pkgs/by-name/am/amazon-q-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix
index 6ca3ba1d0494..404cad014e9b 100644
--- a/pkgs/by-name/am/amazon-q-cli/package.nix
+++ b/pkgs/by-name/am/amazon-q-cli/package.nix
@@ -5,14 +5,14 @@
   protobuf_26,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "amazon-q-cli";
   version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-q-developer-cli";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-BiVCiMBL5LLm8RYw58u6P7yqQq9XnN8b6fTbxNE2QsA=";
   };
 
@@ -71,4 +71,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = [ lib.maintainers.jamesward ];
     platforms = lib.platforms.linux;
   };
-}
+})

From 57c566abdc68181e66998dc667f1d10f861bddac Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 6 May 2025 10:43:49 +0200
Subject: [PATCH 3/3] amazon-q-cli: add `versionCheckHook`

---
 pkgs/by-name/am/amazon-q-cli/package.nix | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix
index 404cad014e9b..32bd757e68a3 100644
--- a/pkgs/by-name/am/amazon-q-cli/package.nix
+++ b/pkgs/by-name/am/amazon-q-cli/package.nix
@@ -3,6 +3,7 @@
   fetchFromGitHub,
   rustPlatform,
   protobuf_26,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -24,6 +25,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "-p"
     "q_cli"
   ];
+
+  nativeBuildInputs = [
+    protobuf_26
+  ];
+
+  postInstall = ''
+    install -m 0755 $out/bin/q_cli $out/bin/amazon-q
+  '';
+
   cargoTestFlags = [
     "-p"
     "q_cli"
@@ -52,13 +62,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=init_lint_zsh_pre_zshrc"
   ];
 
-  nativeBuildInputs = [
-    protobuf_26
-  ];
-
-  postInstall = ''
-    install -m 0755 $out/bin/q_cli $out/bin/amazon-q
-  '';
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/amazon-q";
+  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Amazon Q Developer AI coding agent CLI";