Retropex/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rke2: use finalAttrs to avoid let and rec bindings (#393720)

Browse Source
This commit is contained in:
Wolfgang Walther 2025-04-07 06:42:03 +00:00 committed by GitHub
commit f5ac72aa2a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 118 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/applications/networking/cluster/rke2/builder.nix
View File

@ -44,8 +44,7 @@ lib:
nixosTests,
testers,
}:
let
rke2 = buildGoModule rec {
buildGoModule (finalAttrs: {
pname = "rke2";
version = rke2Version;
@ -81,8 +80,8 @@ let
ldflags = [
"-w"
"-X github.com/k3s-io/k3s/pkg/version.GitCommit=${lib.substring 0 6 rke2Commit}"
"-X github.com/k3s-io/k3s/pkg/version.Program=${pname}"
"-X github.com/k3s-io/k3s/pkg/version.Version=v${version}"
"-X github.com/k3s-io/k3s/pkg/version.Program=${finalAttrs.pname}"
"-X github.com/k3s-io/k3s/pkg/version.Version=v${finalAttrs.version}"
"-X github.com/k3s-io/k3s/pkg/version.UpstreamGolang=go${go.version}"
"-X github.com/rancher/rke2/pkg/images.DefaultRegistry=docker.io"
"-X github.com/rancher/rke2/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${etcdVersion}"
@ -107,7 +106,7 @@ let
installPhase = ''
install -D $GOPATH/bin/rke2 $out/bin/rke2
wrapProgram $out/bin/rke2 \
--prefix PATH : ${lib.makeBinPath buildInputs}
--prefix PATH : ${lib.makeBinPath finalAttrs.buildInputs}
install -D ./bundle/bin/rke2-killall.sh $out/bin/rke2-killall.sh
wrapProgram $out/bin/rke2-killall.sh \
@ -118,7 +117,7 @@ let
gnused
]
} \
--prefix PATH : ${lib.makeBinPath buildInputs}
--prefix PATH : ${lib.makeBinPath finalAttrs.buildInputs}
'';
doCheck = false;
@ -144,8 +143,8 @@ let
in
{
version = testers.testVersion {
package = rke2;
version = "v${version}";
package = finalAttrs.finalPackage;
version = "v${finalAttrs.version}";
};
}
// moduleTests;
@ -164,6 +163,4 @@ let
mainProgram = "rke2";
platforms = platforms.linux;
};
};
in
rke2
})