From aa0f706f63fae23bdcac3e244ea6a96785279b21 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 27 Jan 2026 19:19:16 +0000 Subject: [PATCH] apx: migrate to finalAttrs --- pkgs/by-name/ap/apx/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ap/apx/package.nix b/pkgs/by-name/ap/apx/package.nix index 1c0d2a083888..96fd4b3a557b 100644 --- a/pkgs/by-name/ap/apx/package.nix +++ b/pkgs/by-name/ap/apx/package.nix @@ -12,7 +12,7 @@ writeShellScript, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "apx"; version = "2.4.5"; versionConfig = "1.0.0"; @@ -20,7 +20,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "Vanilla-OS"; repo = "apx"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0Rfj7hrH26R9GHOPPVdCaeb1bfAw9KnPpJYXyiei90U="; }; @@ -28,7 +28,7 @@ buildGoModule rec { configsSrc = fetchFromGitHub { owner = "Vanilla-OS"; repo = "vanilla-apx-configs"; - tag = "v${versionConfig}"; + tag = "v${finalAttrs.versionConfig}"; hash = "sha256-cCXmHkRjcWcpMtgPVtQF5Q76jr1Qt2RHSLtWLQdq+aE="; }; @@ -47,7 +47,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X 'main.Version=v${version}'" + "-X 'main.Version=v${finalAttrs.version}'" ]; postPatch = '' @@ -64,8 +64,8 @@ buildGoModule rec { # Install official Vanilla configs (same as install script) install -d $out/share/apx - cp -r ${configsSrc}/stacks $out/share/apx/ - cp -r ${configsSrc}/package-managers $out/share/apx/ + cp -r ${finalAttrs.configsSrc}/stacks $out/share/apx/ + cp -r ${finalAttrs.configsSrc}/package-managers $out/share/apx/ # Man pages, documentation, license installManPage man/man1/* @@ -113,7 +113,7 @@ buildGoModule rec { environment.systemPackages = with pkgs; [ apx ]; ''; homepage = "https://github.com/Vanilla-OS/apx"; - changelog = "https://github.com/Vanilla-OS/apx/releases/tag/v${version}"; + changelog = "https://github.com/Vanilla-OS/apx/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ dit7ya @@ -122,4 +122,4 @@ buildGoModule rec { ]; mainProgram = "apx"; }; -} +})