From eb5f9a4ff939a1d9983a70a2b5187a48063aeb9e Mon Sep 17 00:00:00 2001 From: Keegan Carruthers-Smith Date: Wed, 18 Jun 2025 12:25:04 +0200 Subject: [PATCH 1/4] src-cli: avoid need for networking in passthru.tests The -client-only will just print the local version. Additionally it won't fail if the binary is out of date. --- pkgs/by-name/sr/src-cli/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/sr/src-cli/package.nix b/pkgs/by-name/sr/src-cli/package.nix index d7e80f91e5a0..f7df125984b8 100644 --- a/pkgs/by-name/sr/src-cli/package.nix +++ b/pkgs/by-name/sr/src-cli/package.nix @@ -35,12 +35,10 @@ buildGoModule rec { "-X=github.com/sourcegraph/src-cli/internal/version.BuildTag=${version}" ]; - __darwinAllowLocalNetworking = true; - passthru.tests = { version = testers.testVersion { package = src-cli; - command = "src version || true"; + command = "src version -client-only"; }; }; From 9664103c069690fc844831a66657e381d6d4cfed Mon Sep 17 00:00:00 2001 From: Keegan Carruthers-Smith Date: Wed, 18 Jun 2025 12:30:29 +0200 Subject: [PATCH 2/4] src-cli: remove xorg.libX11 from buildInputs I'm not sure why this is here, I don't remember src-cli ever having this dependency. --- pkgs/by-name/sr/src-cli/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/sr/src-cli/package.nix b/pkgs/by-name/sr/src-cli/package.nix index f7df125984b8..0f84a15a6ea3 100644 --- a/pkgs/by-name/sr/src-cli/package.nix +++ b/pkgs/by-name/sr/src-cli/package.nix @@ -25,10 +25,6 @@ buildGoModule rec { "cmd/src" ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libX11 - ]; - ldflags = [ "-s" "-w" From 20607c08a132de3ef86c2a63ae42af3a2e8e59a7 Mon Sep 17 00:00:00 2001 From: Keegan Carruthers-Smith Date: Wed, 18 Jun 2025 12:32:45 +0200 Subject: [PATCH 3/4] src-cli: 6.3.0 -> 6.4.0 --- pkgs/by-name/sr/src-cli/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sr/src-cli/package.nix b/pkgs/by-name/sr/src-cli/package.nix index 0f84a15a6ea3..2e0d217a2553 100644 --- a/pkgs/by-name/sr/src-cli/package.nix +++ b/pkgs/by-name/sr/src-cli/package.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "src-cli"; - version = "6.3.0"; + version = "6.4.0"; src = fetchFromGitHub { owner = "sourcegraph"; From e8a26068500150634aa7d9be1ee14a4b9f593558 Mon Sep 17 00:00:00 2001 From: Keegan Carruthers-Smith Date: Wed, 18 Jun 2025 12:33:52 +0200 Subject: [PATCH 4/4] src-cli: add keegancsmith as a maintainer Note: I work at Sourcegraph. --- pkgs/by-name/sr/src-cli/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sr/src-cli/package.nix b/pkgs/by-name/sr/src-cli/package.nix index 2e0d217a2553..5ff1cee38c90 100644 --- a/pkgs/by-name/sr/src-cli/package.nix +++ b/pkgs/by-name/sr/src-cli/package.nix @@ -43,7 +43,10 @@ buildGoModule rec { homepage = "https://github.com/sourcegraph/src-cli"; changelog = "https://github.com/sourcegraph/src-cli/blob/${src.rev}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ + figsoda + keegancsmith + ]; mainProgram = "src"; }; }