diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2019-09-15 20:03:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-15 20:03:13 +0200 |
| commit | 3ddbe41f7951d4dba5f5c9ff6cbdd9337da2014e (patch) | |
| tree | eb85e17becb46523790f4c7c00e049a88f17c848 /pkgs | |
| parent | 2a8f7d71ce88983f14936b76a1d18ef432d65883 (diff) | |
| parent | 4a172176966b873422bcddae6b20c3388ae33a37 (diff) | |
| download | nixpkgs-3ddbe41f7951d4dba5f5c9ff6cbdd9337da2014e.tar nixpkgs-3ddbe41f7951d4dba5f5c9ff6cbdd9337da2014e.tar.gz nixpkgs-3ddbe41f7951d4dba5f5c9ff6cbdd9337da2014e.tar.bz2 nixpkgs-3ddbe41f7951d4dba5f5c9ff6cbdd9337da2014e.tar.lz nixpkgs-3ddbe41f7951d4dba5f5c9ff6cbdd9337da2014e.tar.xz nixpkgs-3ddbe41f7951d4dba5f5c9ff6cbdd9337da2014e.tar.zst nixpkgs-3ddbe41f7951d4dba5f5c9ff6cbdd9337da2014e.zip | |
Merge pull request #68723 from jonringer/freeze-azure-storage
nixops_1_6_1: fix build
Diffstat (limited to 'pkgs')
4 files changed, 41 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix index 3b25ce6bcfb..b3c6f3fa1cc 100644 --- a/pkgs/development/python-modules/azure-common/default.nix +++ b/pkgs/development/python-modules/azure-common/default.nix @@ -1,8 +1,9 @@ -{ pkgs +{ lib , buildPythonPackage , fetchPypi , azure-nspkg , isPyPy +, setuptools , python , isPy3k }: @@ -20,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ azure-nspkg - ]; + ] ++ lib.optionals (!isPy3k) [ setuptools ]; # need for namespace lookup postInstall = if isPy3k then "" else '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py @@ -28,7 +29,7 @@ buildPythonPackage rec { doCheck = false; - meta = with pkgs.lib; { + meta = with lib; { description = "This is the Microsoft Azure common code"; homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-common; license = licenses.mit; diff --git a/pkgs/development/python-modules/azure-mgmt-common/default.nix b/pkgs/development/python-modules/azure-mgmt-common/default.nix index e948afd91cf..482c0d190bc 100644 --- a/pkgs/development/python-modules/azure-mgmt-common/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-common/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { postInstall = if isPy3k then "" else '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py ''; doCheck = false; diff --git a/pkgs/tools/package-management/nixops/azure-storage/default.nix b/pkgs/tools/package-management/nixops/azure-storage/default.nix new file mode 100644 index 00000000000..6693a7464d4 --- /dev/null +++ b/pkgs/tools/package-management/nixops/azure-storage/default.nix @@ -0,0 +1,35 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, python +, azure-common +, futures +, dateutil +, requests +, isPy3k +}: + +buildPythonPackage rec { + version = "0.20.3"; + pname = "azure-storage"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "06bmw6k2000kln5jwk5r9bgcalqbyvqirmdh9gq4s6nb4fv3c0jb"; + }; + + propagatedBuildInputs = [ azure-common dateutil requests ] + ++ pkgs.lib.optionals (!isPy3k) [ futures ]; + + postInstall = '' + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + ''; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix b/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix index d9ba324dce7..e6e30b26240 100644 --- a/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix +++ b/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix @@ -26,6 +26,7 @@ callPackage ./generic.nix (rec { azure-mgmt-nspkg = callPackage ./azure-mgmt-nspkg { }; azure-mgmt-resource = callPackage ./azure-mgmt-resource { }; azure-mgmt-storage = callPackage ./azure-mgmt-storage { }; + azure-storage = callPackage ./azure-storage { }; }); }; }) |