From b7b4b839bbcf62332a3a8aaec81d66cc1afa6060 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Jun 2022 18:23:00 +0000 Subject: [PATCH 1/2] python310Packages.pulumi-aws: 5.3.0 -> 5.7.2 --- pkgs/development/python-modules/pulumi-aws/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index 69a4ea692072..ce48389e9867 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pulumi-aws"; # version is independant of pulumi's. - version = "5.3.0"; + version = "5.7.2"; disabled = isPy27; src = fetchFromGitHub { owner = "pulumi"; repo = "pulumi-aws"; - rev = "v${version}"; - sha256 = "sha256-LrWiNYJeQQvXJDOxklRO86VSiaadvkOepQVPhh2BBkk="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-oy2TBxE9zDbRc6cSml4nwibAAEq3anWngoxj6h4sYbU="; }; propagatedBuildInputs = [ From ab4e0fc110eb4850da9eb410d0d81920641b7456 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Jun 2022 10:14:57 +0200 Subject: [PATCH 2/2] python310Packages.pulumi-aws: use sourceRoot --- .../python-modules/pulumi-aws/default.nix | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index ce48389e9867..170a24ff70fb 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -1,40 +1,43 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , fetchFromGitHub , fetchpatch -, pulumi , parver +, pulumi +, pythonOlder , semver -, isPy27 }: buildPythonPackage rec { pname = "pulumi-aws"; - # version is independant of pulumi's. + # Version is independant of pulumi's. version = "5.7.2"; - disabled = isPy27; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - sha256 = "sha256-oy2TBxE9zDbRc6cSml4nwibAAEq3anWngoxj6h4sYbU="; + hash = "sha256-oy2TBxE9zDbRc6cSml4nwibAAEq3anWngoxj6h4sYbU="; }; + sourceRoot = "${src.name}/sdk/python"; + propagatedBuildInputs = [ - pulumi parver + pulumi semver ]; - postPatch = '' - cd sdk/python - ''; - - # checks require cloud resources + # Checks require cloud resources doCheck = false; - pythonImportsCheck = ["pulumi_aws"]; + + pythonImportsCheck = [ + "pulumi_aws" + ]; meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;