diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix b/pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix index b43fdbe67270..7ef597201b98 100644 --- a/pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix +++ b/pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "pulumi-language-go"; inherit (pulumi) version src; - sourceRoot = "${src.name}/sdk"; + sourceRoot = "${src.name}/sdk/go/pulumi-language-go"; - vendorHash = pulumi.sdkVendorHash; - - subPackages = [ - "go/pulumi-language-go" - ]; + vendorHash = "sha256-6/umLzw7HMplP/cJknBsWmiwAnc+YM4tIz4Zl2QMTOQ="; ldflags = [ "-s" "-w" "-X github.com/pulumi/pulumi/sdk/v3/go/common/version.Version=${version}" ]; + + # go: inconsistent vendoring in ... + doCheck = false; + meta = with lib; { description = "Golang language host plugin for Pulumi"; homepage = "https://github.com/pulumi/pulumi/tree/master/sdk/go"; diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix b/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix index c5cad8f202a0..02bb86d0e8e5 100644 --- a/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix +++ b/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix @@ -1,5 +1,4 @@ -{ lib -, buildGoModule +{ buildGoModule , pulumi , nodejs }: @@ -8,13 +7,9 @@ buildGoModule rec { pname = "pulumi-language-nodejs"; - sourceRoot = "${src.name}/sdk"; + sourceRoot = "${src.name}/sdk/nodejs/cmd/pulumi-language-nodejs"; - vendorHash = sdkVendorHash; - - subPackages = [ - "nodejs/cmd/pulumi-language-nodejs" - ]; + vendorHash = "sha256-3kDWb+1aebV2D+Nm5bkhKrJZMe/lD0ltFQ7p+Bfk644="; ldflags = [ "-s" @@ -25,9 +20,4 @@ buildGoModule rec { nativeCheckInputs = [ nodejs ]; - - postInstall = '' - cp nodejs/dist/pulumi-resource-pulumi-nodejs $out/bin - cp nodejs/dist/pulumi-analyzer-policy $out/bin - ''; }