Unverified Commit 9fcea7bb authored by Thiago Kenji Okada's avatar Thiago Kenji Okada Committed by GitHub
Browse files

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

pulumiPackages.pulumi-command: 0.7.1 -> 0.9.0
parents fc3e7163 e23b4dad

pkgs/tools/admin/pulumi-packages/base.nix

+14 −7
Original line number Diff line number Diff line
@@ -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 = ''

          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

pkgs/tools/admin/pulumi-packages/pulumi-command.nix

+4 −4
Original line number Diff line number Diff line
@@ -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 = ''