diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-07-12 17:01:01 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-12 17:01:01 +0300 |
| commit | fce60dfe74019d86dad44dfbab7760cfb1953895 (patch) | |
| tree | 9f698ddeeb780742e17e5b24726145577b56aaa1 /pkgs/tools/admin | |
| parent | 9a2d7605d691bd48af165639d84228a8019c20d2 (diff) | |
| parent | 8f519f4c985c3c1c649316367889351a5174083e (diff) | |
| download | nixpkgs-fce60dfe74019d86dad44dfbab7760cfb1953895.tar nixpkgs-fce60dfe74019d86dad44dfbab7760cfb1953895.tar.gz nixpkgs-fce60dfe74019d86dad44dfbab7760cfb1953895.tar.bz2 nixpkgs-fce60dfe74019d86dad44dfbab7760cfb1953895.tar.lz nixpkgs-fce60dfe74019d86dad44dfbab7760cfb1953895.tar.xz nixpkgs-fce60dfe74019d86dad44dfbab7760cfb1953895.tar.zst nixpkgs-fce60dfe74019d86dad44dfbab7760cfb1953895.zip | |
Merge pull request #239917 from wegank/pulumi-hash-2
pulumiPackages.pulumi-language-{go,nodejs}: fix buildDiffstat (limited to 'pkgs/tools/admin')
| -rw-r--r-- | pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix | 12 | ||||
| -rw-r--r-- | pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix | 16 |
2 files changed, 9 insertions, 19 deletions
diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix b/pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix index b43fdbe6727..7ef597201b9 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 c5cad8f202a..02bb86d0e8e 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 - ''; } |