summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerwig Hochleitner <herwig@bendlas.net>2018-12-20 00:10:19 +0100
committerHerwig Hochleitner <herwig@bendlas.net>2019-03-10 22:12:40 +0100
commit7642bfc08529c1b71668e019e4505cefb66349e7 (patch)
treebdf3c94defda26c802c3082a45c6eb1c6f0d3499
parentpythonPackages.msrestazure: init 0.6.0 (diff)
downloadnixpkgs-origin/fix-azure-mgmt.tar.gz
pythonPackage.azure-mgmt-*: fix buildsorigin/fix-azure-mgmt
see https://github.com/NixOS/nixpkgs/issues/52547
-rw-r--r--pkgs/development/python-modules/azure-mgmt-common/default.nix3
-rw-r--r--pkgs/development/python-modules/azure-mgmt-compute/default.nix6
-rw-r--r--pkgs/development/python-modules/azure-mgmt-resource/default.nix6
3 files changed, 2 insertions, 13 deletions
diff --git a/pkgs/development/python-modules/azure-mgmt-common/default.nix b/pkgs/development/python-modules/azure-mgmt-common/default.nix
index 5ba49d1f3f1f..c11b8707cb10 100644
--- a/pkgs/development/python-modules/azure-mgmt-common/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-common/default.nix
@@ -5,6 +5,7 @@
, azure-common
, azure-mgmt-nspkg
, requests
+, msrestazure
}:
buildPythonPackage rec {
@@ -17,7 +18,7 @@ buildPythonPackage rec {
sha256 = "1rmzpz3733wv31rsnqpdy4bbafvk5dhbqx7q0xf62dlz7p0i4f66";
};
- propagatedBuildInputs = [ azure-common azure-mgmt-nspkg requests ];
+ propagatedBuildInputs = [ azure-common azure-mgmt-nspkg requests msrestazure ];
postInstall = ''
echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
index 69f4313a1493..ffd2ea11d7c3 100644
--- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
@@ -15,12 +15,6 @@ buildPythonPackage rec {
sha256 = "356219a354140ea26e6b4f4be4f855f1ffaf63af60de24cd2ca335b4ece9db00";
};
- preConfigure = ''
- # Patch to make this package work on requests >= 2.11.x
- # CAN BE REMOVED ON NEXT PACKAGE UPDATE
- sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/compute/computemanagement.py
- '';
-
postInstall = ''
echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix
index afcc58ec7e40..e5f5b38509f4 100644
--- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix
@@ -16,12 +16,6 @@ buildPythonPackage rec {
sha256 = "aef8573066026db04ed3e7c5e727904e42f6462b6421c2e8a3646e4c4f8128be";
};
- preConfigure = ''
- # Patch to make this package work on requests >= 2.11.x
- # CAN BE REMOVED ON NEXT PACKAGE UPDATE
- sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/resource/resourcemanagement.py
- '';
-
postInstall = ''
echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py