Merge pull request #256695 from Trundle/pulumi-command-0.9.0

pulumiPackages.pulumi-command: 0.7.1 -> 0.9.0

authored by

Thiago Kenji Okada and committed by
GitHub
9fcea7bb fc3e7163

+18 -11
+14 -7
pkgs/tools/admin/pulumi-packages/base.nix
··· 33 33 , version 34 34 , ... 35 35 }: python3Packages.callPackage 36 - ({ buildPythonPackage, pythonOlder, parver, pulumi, semver }: 36 + ({ buildPythonPackage, pythonOlder, parver, pip, pulumi, semver, setuptools }: 37 37 buildPythonPackage rec { 38 38 inherit pname meta src version; 39 - format = "setuptools"; 39 + format = "pyproject"; 40 40 41 41 disabled = pythonOlder "3.7"; 42 42 ··· 46 46 parver 47 47 pulumi 48 48 semver 49 + setuptools 49 50 ]; 50 51 51 52 postPatch = '' 52 - sed -i \ 53 - -e 's/^VERSION = .*/VERSION = "${version}"/g' \ 54 - -e 's/^PLUGIN_VERSION = .*/PLUGIN_VERSION = "${version}"/g' \ 55 - setup.py 53 + if [[ -e "pyproject.toml" ]]; then 54 + sed -i \ 55 + -e 's/^ version = .*/ version = "${version}"/g' \ 56 + pyproject.toml 57 + else 58 + sed -i \ 59 + -e 's/^VERSION = .*/VERSION = "${version}"/g' \ 60 + -e 's/^PLUGIN_VERSION = .*/PLUGIN_VERSION = "${version}"/g' \ 61 + setup.py 62 + fi 56 63 ''; 57 64 58 65 # Auto-generated; upstream does not have any tests. ··· 60 67 checkPhase = '' 61 68 runHook preCheck 62 69 63 - pip show "${pname}" | grep "Version: ${version}" > /dev/null \ 70 + ${pip}/bin/pip show "${pname}" | grep "Version: ${version}" > /dev/null \ 64 71 || (echo "ERROR: Version substitution seems to be broken"; exit 1) 65 72 66 73 runHook postCheck
+4 -4
pkgs/tools/admin/pulumi-packages/pulumi-command.nix
··· 4 4 mkPulumiPackage rec { 5 5 owner = "pulumi"; 6 6 repo = "pulumi-command"; 7 - version = "0.7.1"; 7 + version = "0.9.0"; 8 8 rev = "v${version}"; 9 - hash = "sha256-QrKtnpJGWoc5WwV6bnERrN3iBJpyoFKFwlqBtNNK7F8="; 10 - vendorHash = "sha256-HyzWPRYfjdjGGBByCc8N91qWhX2QBJoQMpudHWrkmFM="; 9 + hash = "sha256-VnbtPhMyTZ4Oy+whOK6Itr2vqUagwZUODONL13fjMaU="; 10 + vendorHash = "sha256-MBWDEVA29uzHD3B/iPe68ntGjMM1SCTDq/TL+NgMc6c="; 11 11 cmdGen = "pulumi-gen-command"; 12 12 cmdRes = "pulumi-resource-command"; 13 13 extraLdflags = [ 14 - "-X github.com/pulumi/${repo}/provider/v4/pkg/version.Version=v${version}" 14 + "-X github.com/pulumi/${repo}/provider/pkg/version.Version=v${version}" 15 15 ]; 16 16 17 17 postConfigure = ''