Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a90bfc1df595
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cf00818ba295
Choose a head ref
  • 3 commits
  • 6 files changed
  • 1 contributor

Commits on Mar 10, 2019

  1. pythonPackages.msrest: init 0.6.2 

    (cherry picked from commit 668d18c)
    @bendlas
    bendlas committed Mar 10, 2019
    Copy the full SHA
    8ac84e4 View commit details

  2. pythonPackages.msrestazure: init 0.6.0 

    (cherry picked from commit 292a452)
    @bendlas
    bendlas committed Mar 10, 2019
    Copy the full SHA
    d5f3c49 View commit details

  3. pythonPackage.azure-mgmt-*: fix builds 

    see #52547

(cherry picked from commit 88d9ef9)
    @bendlas
    bendlas committed Mar 10, 2019
    Copy the full SHA
    cf00818 View commit details
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/azure-mgmt-common/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
6 changes: 0 additions & 6 deletions pkgs/development/python-modules/azure-mgmt-compute/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
6 changes: 0 additions & 6 deletions pkgs/development/python-modules/azure-mgmt-resource/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
28 changes: 28 additions & 0 deletions pkgs/development/python-modules/msrest/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{ pkgs
, buildPythonPackage
, fetchPypi
, python
, certifi
, requests_oauthlib
, typing
, isodate
}:

buildPythonPackage rec {
version = "0.6.2";
pname = "msrest";

src = fetchPypi {
inherit pname version;
sha256 = "0icklfjaagk0j9iwq897avmqhwwmgs7c5yy5jw3ppdqz6h0sm38v";
};

propagatedBuildInputs = [ certifi requests_oauthlib typing isodate ];

meta = with pkgs.lib; {
description = "The runtime library 'msrest' for AutoRest generated Python clients.";
homepage = "https://azure.microsoft.com/en-us/develop/python/";
license = licenses.mit;
maintainers = with maintainers; [ bendlas ];
};
}
26 changes: 26 additions & 0 deletions pkgs/development/python-modules/msrestazure/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{ pkgs
, buildPythonPackage
, fetchPypi
, python
, adal
, msrest
}:

buildPythonPackage rec {
version = "0.6.0";
pname = "msrestazure";

src = fetchPypi {
inherit pname version;
sha256 = "06s04f6nng4na2663kc12a3skiaqb631nscjfwpsrx4lzkf8bccr";
};

propagatedBuildInputs = [ adal msrest ];

meta = with pkgs.lib; {
description = "The runtime library 'msrestazure' for AutoRest generated Python clients.";
homepage = "https://azure.microsoft.com/en-us/develop/python/";
license = licenses.mit;
maintainers = with maintainers; [ bendlas ];
};
}
3 changes: 3 additions & 0 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -486,6 +486,9 @@ in {
mpi = pkgs.openmpi;
};

msrestazure = callPackage ../development/python-modules/msrestazure { };
msrest = callPackage ../development/python-modules/msrest { };

multiset = callPackage ../development/python-modules/multiset { };

mwclient = callPackage ../development/python-modules/mwclient { };