diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/admin/pulumi-packages')
5 files changed, 39 insertions, 27 deletions
diff --git a/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix b/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix index 5dcd156d555b..74d9bb28a501 100644 --- a/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix +++ b/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix @@ -4,15 +4,30 @@ mkPulumiPackage rec { owner = "pulumi"; repo = "pulumi-azure-native"; - version = "1.92.0"; + version = "2.11.0"; rev = "v${version}"; - hash = "sha256-eSHD7ckiHJJoqJFeSlwxl063QRRTtiWdpu1m9OVRhoA="; - vendorHash = "sha256-DI92fCe8HPwjERkBVlOebZpvCreq9850OeERDkiayz8="; + hash = "sha256-qz/dCQR4BV+noJj7WPGuzDNMaR7I/D01F7FfvxU8z28="; + vendorHash = "sha256-SICms1JJk8Q10XWC69bw/RXsIPL43l1s+Aqy+cLOwRI="; cmdGen = "pulumi-gen-azure-native"; cmdRes = "pulumi-resource-azure-native"; extraLdflags = [ - "-X github.com/pulumi/${repo}/provider/pkg/version.Version=v${version}" + "-X github.com/pulumi/${repo}/v2/provider/pkg/version.Version=${version}" ]; + postConfigure = '' + pushd .. + + chmod +w . provider/cmd/${cmdRes} sdk/ + chmod -R +w reports/ versions/ + mkdir bin + ${cmdGen} schema ${version} + + cp bin/schema-full.json provider/cmd/${cmdRes} + cp bin/metadata-compact.json provider/cmd/${cmdRes} + + popd + + VERSION=v${version} go generate cmd/${cmdRes}/main.go + ''; fetchSubmodules = true; __darwinAllowLocalNetworking = true; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix b/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix index 7ef597201b98..ef43a412482e 100644 --- a/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix +++ b/nixpkgs/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-6JnRPns+qOLXP2RBjsgq4v6nuLn3uX8jF4+uinr2Wt8"; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix b/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix index 02bb86d0e8e5..dc1368afe2df 100644 --- a/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix +++ b/nixpkgs/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-gbZoDUJCKb5wcLhJ7DRSGHT3Q0xUlptUeS6Wen4dle0"; + + 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/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix b/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix index e63e311fabec..16610c2f46f6 100644 --- a/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix +++ b/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix @@ -1,32 +1,22 @@ -{ lib -, buildGoModule +{ buildGoModule , pulumi , 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-aLCgAcrgnNH/eYpGkr5Kj4xWjSgP76nz0YoV6998i9M="; 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 +28,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 ''; } diff --git a/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-random.nix b/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-random.nix index 4248ae73dda7..af704eac192d 100644 --- a/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-random.nix +++ b/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-random.nix @@ -4,10 +4,10 @@ mkPulumiPackage rec { owner = "pulumi"; repo = "pulumi-random"; - version = "4.8.2"; + version = "4.14.0"; rev = "v${version}"; - hash = "sha256-tFEtBgNpl8090RuVMEkyGmdfpZK8wvOD4iog1JRq+GY="; - vendorHash = "sha256-H3mpKxb1lt+du3KterYPV6WWs1D0XXlmemMyMiZBnqs="; + hash = "sha256-1MR7zWNBDbAUoRed7IU80PQxeH18x95MKJKejW5m2Rs="; + vendorHash = "sha256-YDuF89F9+pxVq4TNe5l3JlbcqpnJwSTPAP4TwWTriWA="; cmdGen = "pulumi-tfgen-random"; cmdRes = "pulumi-resource-random"; extraLdflags = [ |