Merge pull request #263085 from afreakk/bump-pulumi

pulumi: 3.72.2 -> 3.89.0

3 files changed, 16 insertions, 18 deletions

diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix b/pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix
index 7ef597201b982..38b820c5fdee9 100644
--- a/pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix
+++ b/pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix
@@ -8,7 +8,7 @@ buildGoModule rec {
 
   sourceRoot = "${src.name}/sdk/go/pulumi-language-go";
 
-  vendorHash = "sha256-6/umLzw7HMplP/cJknBsWmiwAnc+YM4tIz4Zl2QMTOQ=";
+  vendorHash = "sha256-hMJ6x/zG6rwk/Ai54EF3jwKOTNZ9mwP/JQuX8eGYYVU=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix b/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix
index 02bb86d0e8e53..90250674cd5cb 100644
--- a/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix
+++ b/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix
@@ -9,7 +9,14 @@ buildGoModule rec {
 
   sourceRoot = "${src.name}/sdk/nodejs/cmd/pulumi-language-nodejs";
 
-  vendorHash = "sha256-3kDWb+1aebV2D+Nm5bkhKrJZMe/lD0ltFQ7p+Bfk644=";
+  vendorHash = "sha256-763jxzGCkJ42TKX6ziPb9hNRIo3drMArIZ8QRuSB31k=";
+
+  postPatch = ''
+    # Gives github.com/pulumi/pulumi/pkg/v3: is replaced in go.mod, but not marked as replaced in vendor/modules.txt etc
+    substituteInPlace language_test.go \
+      --replace "TestLanguage" \
+                "SkipTestLanguage"
+  '';
 
   ldflags = [
     "-s"
diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix b/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix
index e63e311fabec0..b9be1f9179438 100644
--- a/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix
+++ b/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix
@@ -4,29 +4,20 @@
 , python3
 }:
 buildGoModule rec {
-  inherit (pulumi) version src sdkVendorHash;
+  inherit (pulumi) version src;
 
   pname = "pulumi-language-python";
 
-  sourceRoot = "${src.name}/sdk";
+  sourceRoot = "${src.name}/sdk/python/cmd/pulumi-language-python";
 
-  vendorHash = sdkVendorHash;
+  vendorHash = "sha256-HlcSkFoLPcHRyp0yH+ojGnL/gubfGyCP1iCK6sOootQ=";
 
   postPatch = ''
-    # Requires network
-    substituteInPlace python/python_test.go \
-      --replace "TestRunningPipInVirtualEnvironment" \
-                "SkipTestRunningPipInVirtualEnvironment"
-
-    substituteInPlace python/cmd/pulumi-language-python/main_test.go \
+    substituteInPlace main_test.go \
       --replace "TestDeterminePulumiPackages" \
                 "SkipTestDeterminePulumiPackages"
   '';
 
-  subPackages = [
-    "python/cmd/pulumi-language-python"
-  ];
-
   ldflags = [
     "-s"
     "-w"
@@ -38,8 +29,8 @@ buildGoModule rec {
   ];
 
   postInstall = ''
-    cp python/cmd/pulumi-language-python-exec    $out/bin
-    cp python/dist/pulumi-resource-pulumi-python $out/bin
-    cp python/dist/pulumi-analyzer-policy-python $out/bin
+    cp ../pulumi-language-python-exec           $out/bin
+    cp ../../dist/pulumi-resource-pulumi-python $out/bin
+    cp ../../dist/pulumi-analyzer-policy-python $out/bin
   '';
 }