From 09815bc4bb54aa6777b7f8f790fae3175c10ec19 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Jul 2025 14:34:59 +0200 Subject: [PATCH 1/3] gdu: 5.30.1 -> 5.31.0 Changelog: https://github.com/dundee/gdu/releases/tag/v5.31.0 --- pkgs/by-name/gd/gdu/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gd/gdu/package.nix b/pkgs/by-name/gd/gdu/package.nix index c8625f889714..6badd8e73021 100644 --- a/pkgs/by-name/gd/gdu/package.nix +++ b/pkgs/by-name/gd/gdu/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "gdu"; - version = "5.30.1"; + version = "5.31.0"; src = fetchFromGitHub { owner = "dundee"; repo = "gdu"; tag = "v${version}"; - hash = "sha256-3SymmE3J+lphyRKTQ+sLsnXaBvLyjJRlwpy79U4+t5o="; + hash = "sha256-MAkD4Mh7aXWc8Y4TkXH7NSDgPQugB7Gjhr4nfOr/X1U="; }; vendorHash = "sha256-aKhHC3sPRyi/l9BxeUgx+3TdYulb0cI9WxuPvbLoswg="; @@ -43,6 +43,7 @@ buildGoModule rec { checkFlags = [ # https://github.com/dundee/gdu/issues/371 "-skip=TestStoredAnalyzer" + "-skip=TestAnalyzePathWithIgnoring" ]; passthru.tests.version = testers.testVersion { package = gdu; }; From c4ac7eb951f562376409f66f07fe4a5117b12c69 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Jul 2025 22:10:51 +0200 Subject: [PATCH 2/3] adu: migrate to versionCheckHook --- pkgs/by-name/gd/gdu/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gd/gdu/package.nix b/pkgs/by-name/gd/gdu/package.nix index 6badd8e73021..b5053e2c1d41 100644 --- a/pkgs/by-name/gd/gdu/package.nix +++ b/pkgs/by-name/gd/gdu/package.nix @@ -4,8 +4,7 @@ buildGoModule, fetchFromGitHub, installShellFiles, - testers, - gdu, + versionCheckHook, }: buildGoModule rec { @@ -21,7 +20,10 @@ buildGoModule rec { vendorHash = "sha256-aKhHC3sPRyi/l9BxeUgx+3TdYulb0cI9WxuPvbLoswg="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + versionCheckHook + ]; ldflags = [ "-s" @@ -46,7 +48,7 @@ buildGoModule rec { "-skip=TestAnalyzePathWithIgnoring" ]; - passthru.tests.version = testers.testVersion { package = gdu; }; + doInstallCheck = true; meta = { description = "Disk usage analyzer with console interface"; From 150e9dbb079ef222742440562200e5a638b8a563 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Jul 2025 22:13:05 +0200 Subject: [PATCH 3/3] gdu: migrate to finalAttrs --- pkgs/by-name/gd/gdu/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/gd/gdu/package.nix b/pkgs/by-name/gd/gdu/package.nix index b5053e2c1d41..39d4e677d915 100644 --- a/pkgs/by-name/gd/gdu/package.nix +++ b/pkgs/by-name/gd/gdu/package.nix @@ -7,14 +7,14 @@ versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "gdu"; version = "5.31.0"; src = fetchFromGitHub { owner = "dundee"; repo = "gdu"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-MAkD4Mh7aXWc8Y4TkXH7NSDgPQugB7Gjhr4nfOr/X1U="; }; @@ -28,12 +28,12 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X=github.com/dundee/gdu/v${lib.versions.major version}/build.Version=${version}" + "-X=github.com/dundee/gdu/v${lib.versions.major finalAttrs.version}/build.Version=${finalAttrs.version}" ]; postPatch = '' substituteInPlace cmd/gdu/app/app_test.go \ - --replace-fail "development" "${version}" + --replace-fail "development" "${finalAttrs.version}" ''; postInstall = '' @@ -58,7 +58,7 @@ buildGoModule rec { the performance gain is not so huge. ''; homepage = "https://github.com/dundee/gdu"; - changelog = "https://github.com/dundee/gdu/releases/tag/v${version}"; + changelog = "https://github.com/dundee/gdu/releases/tag/${finalAttrs.src.tag}"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fab @@ -66,4 +66,4 @@ buildGoModule rec { ]; mainProgram = "gdu"; }; -} +})