diff options
| author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2023-09-25 12:56:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-25 12:56:01 +0100 |
| commit | 9fcea7bbb55cf49fe742b7f12732ad1568c2bb14 (patch) | |
| tree | e853ea8cc0dad28a5eed092fb5431ad7fffa2007 | |
| parent | fc3e7163dd2fb397ad28449abe793ef64d1752c4 (diff) | |
| parent | e23b4dadce0871375f139dff55633759c64c741d (diff) | |
| download | nixpkgs-9fcea7bbb55cf49fe742b7f12732ad1568c2bb14.tar nixpkgs-9fcea7bbb55cf49fe742b7f12732ad1568c2bb14.tar.gz nixpkgs-9fcea7bbb55cf49fe742b7f12732ad1568c2bb14.tar.bz2 nixpkgs-9fcea7bbb55cf49fe742b7f12732ad1568c2bb14.tar.lz nixpkgs-9fcea7bbb55cf49fe742b7f12732ad1568c2bb14.tar.xz nixpkgs-9fcea7bbb55cf49fe742b7f12732ad1568c2bb14.tar.zst nixpkgs-9fcea7bbb55cf49fe742b7f12732ad1568c2bb14.zip | |
Merge pull request #256695 from Trundle/pulumi-command-0.9.0
pulumiPackages.pulumi-command: 0.7.1 -> 0.9.0
| -rw-r--r-- | pkgs/tools/admin/pulumi-packages/base.nix | 21 | ||||
| -rw-r--r-- | pkgs/tools/admin/pulumi-packages/pulumi-command.nix | 8 |
2 files changed, 18 insertions, 11 deletions
diff --git a/pkgs/tools/admin/pulumi-packages/base.nix b/pkgs/tools/admin/pulumi-packages/base.nix index 001a247379b..8327e41dcd5 100644 --- a/pkgs/tools/admin/pulumi-packages/base.nix +++ b/pkgs/tools/admin/pulumi-packages/base.nix @@ -33,10 +33,10 @@ let , version , ... }: python3Packages.callPackage - ({ buildPythonPackage, pythonOlder, parver, pulumi, semver }: + ({ buildPythonPackage, pythonOlder, parver, pip, pulumi, semver, setuptools }: buildPythonPackage rec { inherit pname meta src version; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -46,13 +46,20 @@ let parver pulumi semver + setuptools ]; postPatch = '' - sed -i \ - -e 's/^VERSION = .*/VERSION = "${version}"/g' \ - -e 's/^PLUGIN_VERSION = .*/PLUGIN_VERSION = "${version}"/g' \ - setup.py + if [[ -e "pyproject.toml" ]]; then + sed -i \ + -e 's/^ version = .*/ version = "${version}"/g' \ + pyproject.toml + else + sed -i \ + -e 's/^VERSION = .*/VERSION = "${version}"/g' \ + -e 's/^PLUGIN_VERSION = .*/PLUGIN_VERSION = "${version}"/g' \ + setup.py + fi ''; # Auto-generated; upstream does not have any tests. @@ -60,7 +67,7 @@ let checkPhase = '' runHook preCheck - pip show "${pname}" | grep "Version: ${version}" > /dev/null \ + ${pip}/bin/pip show "${pname}" | grep "Version: ${version}" > /dev/null \ || (echo "ERROR: Version substitution seems to be broken"; exit 1) runHook postCheck diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-command.nix b/pkgs/tools/admin/pulumi-packages/pulumi-command.nix index 3b181ceb05b..d53e9593fee 100644 --- a/pkgs/tools/admin/pulumi-packages/pulumi-command.nix +++ b/pkgs/tools/admin/pulumi-packages/pulumi-command.nix @@ -4,14 +4,14 @@ mkPulumiPackage rec { owner = "pulumi"; repo = "pulumi-command"; - version = "0.7.1"; + version = "0.9.0"; rev = "v${version}"; - hash = "sha256-QrKtnpJGWoc5WwV6bnERrN3iBJpyoFKFwlqBtNNK7F8="; - vendorHash = "sha256-HyzWPRYfjdjGGBByCc8N91qWhX2QBJoQMpudHWrkmFM="; + hash = "sha256-VnbtPhMyTZ4Oy+whOK6Itr2vqUagwZUODONL13fjMaU="; + vendorHash = "sha256-MBWDEVA29uzHD3B/iPe68ntGjMM1SCTDq/TL+NgMc6c="; cmdGen = "pulumi-gen-command"; cmdRes = "pulumi-resource-command"; extraLdflags = [ - "-X github.com/pulumi/${repo}/provider/v4/pkg/version.Version=v${version}" + "-X github.com/pulumi/${repo}/provider/pkg/version.Version=v${version}" ]; postConfigure = '' |