git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #68723 from jonringer/freeze-azure-storage

nixops_1_6_1: fix build

commit3ddbe41f7951d4dba5f5c9ff6cbdd9337da2014e authorMaximilian Bosch <maximilian@mbosch.me> dateSun 15 Sep 2019, 20:03 (7 years ago) parent2a8f7d74a17217
4 files changed+41−3
pkgs/development/python-modules/azure-common/default.nix+4−3 pkgs/development/python-modules/azure-mgmt-common/default.nix+1 pkgs/tools/package-management/nixops/azure-storage/default.nix+35 pkgs/tools/package-management/nixops/nixops-v1_6_1.nix+1
pkgs/development/python-modules/azure-common/default.nix+4−3
@@ -1,8 +1,9 @@
1−{ pkgs
1+{ lib
22, buildPythonPackage
33, fetchPypi
44, azure-nspkg
55, isPyPy
6+, setuptools
67, python
78, isPy3k
89}:
@@ -20,7 +21,7 @@ buildPythonPackage rec {
2021
2122 propagatedBuildInputs = [
2223 azure-nspkg
23− ];
24+ ] ++ lib.optionals (!isPy3k) [ setuptools ]; # need for namespace lookup
2425
2526 postInstall = if isPy3k then "" else ''
2627 echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
@@ -28,7 +29,7 @@ buildPythonPackage rec {
2829
2930 doCheck = false;
3031
31− meta = with pkgs.lib; {
32+ meta = with lib; {
3233 description = "This is the Microsoft Azure common code";
3334 homepage = https://github.com/Azure/azure-sdk-for-python/tree/master/azure-common;
3435 license = licenses.mit;
pkgs/development/python-modules/azure-mgmt-common/default.nix+1
@@ -28,6 +28,7 @@ buildPythonPackage rec {
2828
2929 postInstall = if isPy3k then "" else ''
3030 echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
31+ echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
3132 '';
3233
3334 doCheck = false;
pkgs/tools/package-management/nixops/azure-storage/default.nixnew file+35
@@ -0,0 +1,35 @@
1+{ pkgs
2+, buildPythonPackage
3+, fetchPypi
4+, python
5+, azure-common
6+, futures
7+, dateutil
8+, requests
9+, isPy3k
10+}:
11+
12+buildPythonPackage rec {
13+ version = "0.20.3";
14+ pname = "azure-storage";
15+
16+ src = fetchPypi {
17+ inherit pname version;
18+ extension = "zip";
19+ sha256 = "06bmw6k2000kln5jwk5r9bgcalqbyvqirmdh9gq4s6nb4fv3c0jb";
20+ };
21+
22+ propagatedBuildInputs = [ azure-common dateutil requests ]
23+ ++ pkgs.lib.optionals (!isPy3k) [ futures ];
24+
25+ postInstall = ''
26+ echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
27+ '';
28+
29+ meta = with pkgs.lib; {
30+ description = "Microsoft Azure SDK for Python";
31+ homepage = "https://azure.microsoft.com/en-us/develop/python/";
32+ license = licenses.asl20;
33+ maintainers = with maintainers; [ olcai ];
34+ };
35+}
pkgs/tools/package-management/nixops/nixops-v1_6_1.nix+1
@@ -26,6 +26,7 @@ callPackage ./generic.nix (rec {
2626 azure-mgmt-nspkg = callPackage ./azure-mgmt-nspkg { };
2727 azure-mgmt-resource = callPackage ./azure-mgmt-resource { };
2828 azure-mgmt-storage = callPackage ./azure-mgmt-storage { };
29+ azure-storage = callPackage ./azure-storage { };
2930 });
3031 };
3132})