From d6a442ed8c0b405cf8be98e7143078dd8200aa46 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 2 Feb 2026 00:08:21 +0100 Subject: [PATCH 1/2] regal: set pname --- pkgs/by-name/re/regal/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/re/regal/package.nix b/pkgs/by-name/re/regal/package.nix index 3f312c59747f..9e5e6b6474a0 100644 --- a/pkgs/by-name/re/regal/package.nix +++ b/pkgs/by-name/re/regal/package.nix @@ -5,7 +5,7 @@ }: buildGoModule rec { - name = "regal"; + pname = "regal"; version = "0.38.1"; src = fetchFromGitHub { From f62ee725ee06d3aa0400939d75cae85cdc737dd8 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 2 Feb 2026 00:09:23 +0100 Subject: [PATCH 2/2] regal: use finalAttrs --- pkgs/by-name/re/regal/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/re/regal/package.nix b/pkgs/by-name/re/regal/package.nix index 9e5e6b6474a0..caf8ca8e0041 100644 --- a/pkgs/by-name/re/regal/package.nix +++ b/pkgs/by-name/re/regal/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "regal"; version = "0.38.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "regal"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/WGZCwT9VJ5zjEmL4PZqPymaUJFaWzjbgq2KMBfl6uQ="; }; @@ -23,16 +23,16 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/open-policy-agent/regal/pkg/version.Version=${version}" - "-X github.com/open-policy-agent/regal/pkg/version.Commit=${version}" + "-X github.com/open-policy-agent/regal/pkg/version.Version=${finalAttrs.version}" + "-X github.com/open-policy-agent/regal/pkg/version.Commit=${finalAttrs.version}" ]; meta = { description = "Linter and language server for Rego"; mainProgram = "regal"; homepage = "https://github.com/open-policy-agent/regal"; - changelog = "https://github.com/open-policy-agent/regal/releases/tag/${src.rev}"; + changelog = "https://github.com/open-policy-agent/regal/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ rinx ]; }; -} +})