diff --git a/pkgs/by-name/fl/fleeting-plugin-aws/package.nix b/pkgs/by-name/fl/fleeting-plugin-aws/package.nix index 455488c62c7c..9ae805bcdbc0 100644 --- a/pkgs/by-name/fl/fleeting-plugin-aws/package.nix +++ b/pkgs/by-name/fl/fleeting-plugin-aws/package.nix @@ -6,44 +6,37 @@ versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "fleeting-plugin-aws"; version = "1.0.1"; src = fetchFromGitLab { owner = "gitlab-org/fleeting/plugins"; repo = "aws"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3m7t2uGO7Rlfckb8mdYVutW0/ng0OiUAH5XTBoB//ZU="; }; vendorHash = "sha256-hfuszGVWfMreGz22+dkx0/cxznjq2XZf7pAn4TWOQ5M="; - subPackages = [ "cmd/fleeting-plugin-aws" ]; - - # See https://gitlab.com/gitlab-org/fleeting/plugins/aws/-/blob/v1.0.0/Makefile?ref_type=tags#L20-22. + # Needed for "fleeting-plugin-aws -version" to not show "dev". # - # Needed for "fleeting-plugin-aws version" to not show "dev". + # https://gitlab.com/gitlab-org/fleeting/plugins/aws/-/blob/v1.0.0/Makefile?ref_type=tags#L20-22 ldflags = let - # See https://gitlab.com/gitlab-org/fleeting/plugins/aws/-/blob/v1.0.0/Makefile?ref_type=tags#L14. - # - # Couldn't find a way to substitute "go list ." into "ldflags". ldflagsPackageVariablePrefix = "gitlab.com/gitlab-org/fleeting/plugins/aws"; in [ "-X ${ldflagsPackageVariablePrefix}.NAME=fleeting-plugin-aws" - "-X ${ldflagsPackageVariablePrefix}.VERSION=v${version}" - "-X ${ldflagsPackageVariablePrefix}.REVISION=${src.rev}" + "-X ${ldflagsPackageVariablePrefix}.VERSION=${finalAttrs.version}" + "-X ${ldflagsPackageVariablePrefix}.REFERENCE=v${finalAttrs.version}" ]; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgram = "${builtins.placeholder "out"}/bin/fleeting-plugin-aws"; - - versionCheckProgramArg = "version"; + versionCheckProgramArg = "-version"; passthru = { updateScript = nix-update-script { }; @@ -56,4 +49,4 @@ buildGoModule rec { mainProgram = "fleeting-plugin-aws"; maintainers = with lib.maintainers; [ commiterate ]; }; -} +})