From 5deeec2a14e776e6f26081eeba102657c3a87b74 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 18 Jul 2025 19:36:40 +0200 Subject: [PATCH 1/5] glab: show short commit id when doing `glab version` --- pkgs/by-name/gl/glab/package.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index dc99f424e6d7..182b76aafa44 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -16,7 +16,13 @@ buildGoModule (finalAttrs: { owner = "gitlab-org"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-pouFnmHCfRFDy+MMbRI82o73jO8hRewHeXgGnJ4hnww="; + hash = "sha256-LM1doLLVdY7gOwfYfjwT/aFzVkyXxoD4/WPXJGqoPmw="; + leaveDotGit = true; + postFetch = '' + cd "$out" + git rev-parse --short HEAD > $out/COMMIT + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; }; vendorHash = "sha256-COp4RebkU36OChbZFeLALUppXqHLRbrm3D64Hb5RmI4="; @@ -27,7 +33,10 @@ buildGoModule (finalAttrs: { "-X main.version=${finalAttrs.version}" ]; - nativeCheckInputs = [ writableTmpDirAsHomeHook ]; + preBuild = '' + ldflags+=" -X main.commit=$(cat COMMIT)" + ''; + subPackages = [ "cmd/glab" ]; @@ -42,6 +51,8 @@ buildGoModule (finalAttrs: { --zsh <($out/bin/glab completion -s zsh) ''; + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; + passthru.updateScript = nix-update-script { }; meta = { From bbe778f5d8fe9357446f9af1b896f232412c50ce Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 18 Jul 2025 22:24:03 +0200 Subject: [PATCH 2/5] glab: fix checkPhase, missing `git` --- pkgs/by-name/gl/glab/package.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index 182b76aafa44..8044a74c57cb 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -6,6 +6,7 @@ stdenv, nix-update-script, writableTmpDirAsHomeHook, + gitMinimal, }: buildGoModule (finalAttrs: { @@ -37,11 +38,10 @@ buildGoModule (finalAttrs: { ldflags+=" -X main.commit=$(cat COMMIT)" ''; + nativeBuildInputs = [ installShellFiles ]; subPackages = [ "cmd/glab" ]; - nativeBuildInputs = [ installShellFiles ]; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' make manpage installManPage share/man/man1/* @@ -51,7 +51,14 @@ buildGoModule (finalAttrs: { --zsh <($out/bin/glab completion -s zsh) ''; - nativeCheckInputs = [ writableTmpDirAsHomeHook ]; + nativeCheckInputs = [ + gitMinimal + writableTmpDirAsHomeHook + ]; + + preCheck = '' + git init + ''; passthru.updateScript = nix-update-script { }; From bdb5a8b07ab35609df534ed7a3874b8e20e8d25e Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 18 Jul 2025 22:48:17 +0200 Subject: [PATCH 3/5] glab: disable update check and telemetry by default --- pkgs/by-name/gl/glab/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index 8044a74c57cb..e14ac96026fb 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -3,6 +3,7 @@ buildGoModule, fetchFromGitLab, installShellFiles, + makeBinaryWrapper, stdenv, nix-update-script, writableTmpDirAsHomeHook, @@ -38,7 +39,7 @@ buildGoModule (finalAttrs: { ldflags+=" -X main.commit=$(cat COMMIT)" ''; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles makeBinaryWrapper ]; subPackages = [ "cmd/glab" ]; @@ -49,6 +50,10 @@ buildGoModule (finalAttrs: { --bash <($out/bin/glab completion -s bash) \ --fish <($out/bin/glab completion -s fish) \ --zsh <($out/bin/glab completion -s zsh) + + wrapProgram $out/bin/glab \ + --set-default GLAB_CHECK_UPDATE 0 \ + --set-default GLAB_SEND_TELEMETRY 0 ''; nativeCheckInputs = [ From b3f6d66b504a62093086ef32a55d19f917e25a6c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 18 Jul 2025 22:56:47 +0200 Subject: [PATCH 4/5] glab: 1.61.0 -> 1.62.0 Changelog: https://gitlab.com/gitlab-org/cli/-/releases/v1.62.0 --- pkgs/by-name/gl/glab/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index e14ac96026fb..b0430bff803d 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -12,13 +12,13 @@ buildGoModule (finalAttrs: { pname = "glab"; - version = "1.61.0"; + version = "1.62.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-LM1doLLVdY7gOwfYfjwT/aFzVkyXxoD4/WPXJGqoPmw="; + hash = "sha256-+dXMlNc54i/vEwYV0YRKXrdWejcgfXFW+tFq3tf8TZY="; leaveDotGit = true; postFetch = '' cd "$out" @@ -27,7 +27,7 @@ buildGoModule (finalAttrs: { ''; }; - vendorHash = "sha256-COp4RebkU36OChbZFeLALUppXqHLRbrm3D64Hb5RmI4="; + vendorHash = "sha256-sgph04zjHvvgL0QJm2//h8jyDg/5NY7dq50C0G0hYYM="; ldflags = [ "-s" From 595e2e9581b660f9dd37f7e7983e9298b0986fb4 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 19 Jul 2025 10:07:56 +0200 Subject: [PATCH 5/5] glab: enable `versionCheckHook` --- pkgs/by-name/gl/glab/package.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index b0430bff803d..960ca9c5b5fd 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -7,6 +7,7 @@ stdenv, nix-update-script, writableTmpDirAsHomeHook, + versionCheckHook, gitMinimal, }: @@ -39,7 +40,10 @@ buildGoModule (finalAttrs: { ldflags+=" -X main.commit=$(cat COMMIT)" ''; - nativeBuildInputs = [ installShellFiles makeBinaryWrapper ]; + nativeBuildInputs = [ + installShellFiles + makeBinaryWrapper + ]; subPackages = [ "cmd/glab" ]; @@ -56,15 +60,21 @@ buildGoModule (finalAttrs: { --set-default GLAB_SEND_TELEMETRY 0 ''; - nativeCheckInputs = [ - gitMinimal - writableTmpDirAsHomeHook - ]; + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; preCheck = '' git init ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ + gitMinimal + versionCheckHook + writableTmpDirAsHomeHook + ]; + versionCheckProgramArg = "version"; + versionCheckKeepEnvironment = [ "HOME" ]; + passthru.updateScript = nix-update-script { }; meta = {