From 8313e5f289c6c1e7859edabea0545f057fdccf51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20St=C3=BChrk?= Date: Sat, 7 Jan 2023 13:13:34 +0100 Subject: [PATCH] pulumi: 3.49.0 -> 3.52.0 --- pkgs/development/python-modules/pulumi/default.nix | 4 ++-- pkgs/tools/admin/pulumi/default.nix | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pulumi/default.nix b/pkgs/development/python-modules/pulumi/default.nix index ad779eb2ffc4..2d8c861bf45d 100644 --- a/pkgs/development/python-modules/pulumi/default.nix +++ b/pkgs/development/python-modules/pulumi/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { "test/" ]; - sourceRoot = "source/sdk/python/lib"; + sourceRoot = "${src.name}/sdk/python/lib"; # we apply the modifications done in the pulumi/sdk/python/Makefile # but without the venv code @@ -44,7 +44,7 @@ buildPythonPackage rec { cp ../../README.md . substituteInPlace setup.py \ --replace "3.0.0" "${version}" \ - --replace "grpcio==1.47" "grpcio" + --replace "grpcio==1.50" "grpcio" ''; # Allow local networking in tests on Darwin diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index e95a265ebd6f..d8f5c1e68807 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -14,21 +14,23 @@ buildGoModule rec { pname = "pulumi"; - version = "3.49.0"; + version = "3.52.0"; # Used in pulumi-language packages, which inherit this prop - sdkVendorHash = "sha256-gM3VpX6r/BScUyvk/XefAfbx0qYzdzSBGaWZN+89BS8="; + sdkVendorHash = "sha256-y45TlQF8jJeDLeKEI+ZMcEQqwUIrHPjgTaz1QkjTlEI="; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-WO+bTkTIAyaXl3nYwsMUTdovsYibivfGsKz6A7wj2zM="; + hash = "sha256-UxVIk7LMF7h/Ba09EgkIuna5iAfqKEuzU0qSKJRPpfw="; + # Some tests rely on checkout directory name + name = "pulumi"; }; - vendorSha256 = "sha256-q7ZusTYD8l2RyiwP/Wf6dP6AoosWEwpaylbdhfE5cUA="; + vendorSha256 = "sha256-tr3sp9b9xh5NLK1AO88QQVzYbIysmmgRW2s1IRNHFUI="; - sourceRoot = "source/pkg"; + sourceRoot = "${src.name}/pkg"; nativeBuildInputs = [ installShellFiles ];