From c85d7c7db5e6e0a8684ecaef3f60ca6f0ed23b19 Mon Sep 17 00:00:00 2001 From: Keegan Carruthers-Smith Date: Thu, 29 May 2025 08:44:00 +0200 Subject: [PATCH 1/2] amp-cli: add a smoketest for the binary Just runs --version. Amp will try create a log directory in your homedir, so we need to give it a homedir it can write to. Additionally we remove the rec and use finalAttrs instead. --- pkgs/by-name/am/amp-cli/package.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix index f62ec5f897ea..cb858a95eb2d 100644 --- a/pkgs/by-name/am/amp-cli/package.nix +++ b/pkgs/by-name/am/amp-cli/package.nix @@ -4,14 +4,15 @@ fetchzip, ripgrep, makeWrapper, + testers, }: -buildNpmPackage rec { +buildNpmPackage (finalAttrs: { pname = "amp-cli"; version = "0.0.1748404992-ga3f78f"; src = fetchzip { - url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${version}.tgz"; + url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz"; hash = "sha256-axd5VP7afa4ptAl/y8CEVguqoRKVRhWfRDSI0sgyXqA="; }; @@ -25,7 +26,7 @@ buildNpmPackage rec { "version": "0.0.0", "license": "UNLICENSED", "dependencies": { - "@sourcegraph/amp": "${version}" + "@sourcegraph/amp": "${finalAttrs.version}" }, "bin": { "amp": "./bin/amp-wrapper.js" @@ -69,6 +70,10 @@ buildNpmPackage rec { ''; passthru.updateScript = ./update.sh; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "HOME=$(mktemp -d) amp --version"; + }; meta = { description = "CLI for Amp, an agentic coding agent in research preview from Sourcegraph"; @@ -81,4 +86,4 @@ buildNpmPackage rec { ]; mainProgram = "amp"; }; -} +}) From f2f7b44cb20cf93acc962a75aae7086a6c2f4be7 Mon Sep 17 00:00:00 2001 From: Keegan Carruthers-Smith Date: Mon, 2 Jun 2025 14:35:19 +0200 Subject: [PATCH 2/2] amp-cli: update 0.0.1748404992-ga3f78f -> 0.0.1748865683-g71e54e --- pkgs/by-name/am/amp-cli/package-lock.json | 8 ++++---- pkgs/by-name/am/amp-cli/package.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/am/amp-cli/package-lock.json b/pkgs/by-name/am/amp-cli/package-lock.json index 28c2a16ea664..b4ce79716cfb 100644 --- a/pkgs/by-name/am/amp-cli/package-lock.json +++ b/pkgs/by-name/am/amp-cli/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "@sourcegraph/amp": "^0.0.1748404992-ga3f78f" + "@sourcegraph/amp": "^0.0.1748865683-g71e54e" } }, "node_modules/@colors/colors": { @@ -29,9 +29,9 @@ } }, "node_modules/@sourcegraph/amp": { - "version": "0.0.1748404992-ga3f78f", - "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1748404992-ga3f78f.tgz", - "integrity": "sha512-+BvCW8zrbO7ENRzMg0LdAeKigjzL+ASIDBjJ/m2uL2CVT8WPk1h34FTNCbvnO6kssimEtdP8FcxR/2O4AHwUbA==", + "version": "0.0.1748865683-g71e54e", + "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1748865683-g71e54e.tgz", + "integrity": "sha512-ZiNbIbgCb/l7Q7wRT0sva6Ju7VDtq7+lijMWK8jotPorTq1DYUy3h7XJIOjyJEdvqlQkEfwrnbOfREmsnwlPyg==", "dependencies": { "@types/runes": "^0.4.3", "@vscode/ripgrep": "1.15.11", diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix index cb858a95eb2d..12c2af788b69 100644 --- a/pkgs/by-name/am/amp-cli/package.nix +++ b/pkgs/by-name/am/amp-cli/package.nix @@ -9,11 +9,11 @@ buildNpmPackage (finalAttrs: { pname = "amp-cli"; - version = "0.0.1748404992-ga3f78f"; + version = "0.0.1748865683-g71e54e"; src = fetchzip { url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz"; - hash = "sha256-axd5VP7afa4ptAl/y8CEVguqoRKVRhWfRDSI0sgyXqA="; + hash = "sha256-kkQKjw1SzDjV8/206i+NUyxeDhZ/35My9gyXRe/U7I8="; }; postPatch = '' @@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: { chmod +x bin/amp-wrapper.js ''; - npmDepsHash = "sha256-05+hBr+eX3I92U9TsqPQrYcJCmKXTvz3n6ZTxR1XvC8="; + npmDepsHash = "sha256-yeZ5UCVUCbVjpYTYYN5mI6eCkShtnCKxumjpb5GRCws="; propagatedBuildInputs = [ ripgrep