Unverified Commit f5ac72aa authored by Wolfgang Walther's avatar Wolfgang Walther Committed by GitHub
Browse files

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

parents e0580b29 cd10b44d

pkgs/applications/networking/cluster/rke2/builder.nix

+116 −119
Original line number Diff line number Diff line
@@ -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
 
})