Merge remote-tracking branch 'upstream/master' into HEAD

2016-10-22 17:23:24 +02:00
parent bd12c10993 8c465c5201
commit e56832d730
221 changed files with 10778 additions and 4428 deletions
@@ -1,9 +1,9 @@
-{ lib, pythonPackages, fetchurl, libxslt, docbook5_xsl, openssh
+{ lib, python2Packages, fetchurl, libxslt, docbook5_xsl, openssh
 # version args
 , src, version
 }:

-pythonPackages.buildPythonApplication {
+python2Packages.buildPythonApplication {
  name = "nixops-${version}";
  namePrefix = "";

@@ -11,17 +11,17 @@ pythonPackages.buildPythonApplication {

  buildInputs = [ libxslt ];

-  pythonPath =
-    [ pythonPackages.prettytable
-      pythonPackages.boto
-      pythonPackages.hetzner
-      pythonPackages.libcloud
-      pythonPackages.azure-storage
-      pythonPackages.azure-mgmt-compute
-      pythonPackages.azure-mgmt-network
-      pythonPackages.azure-mgmt-resource
-      pythonPackages.azure-mgmt-storage
-      pythonPackages.adal
+  pythonPath = with python2Packages;
+    [ prettytable
+      boto
+      hetzner
+      libcloud
+      azure-storage
+      azure-mgmt-compute
+      azure-mgmt-network
+      azure-mgmt-resource
+      azure-mgmt-storage
+      adal
    ];

  doCheck = false;