diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2016-10-22 17:23:24 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-10-22 17:23:24 +0200 |
| commit | e56832d7301f2be7c18abf12d151db00be88f6fa (patch) | |
| tree | 8023c83da9db86e0a31535ad9b09e9f601c3b250 /pkgs/tools/package-management/nixops | |
| parent | bd12c109931951a36449edaa9c8ed3fc85dc6984 (diff) | |
| parent | 8c465c5201e819486b3072be563738cc1801e8d7 (diff) | |
| download | nixpkgs-e56832d7301f2be7c18abf12d151db00be88f6fa.tar nixpkgs-e56832d7301f2be7c18abf12d151db00be88f6fa.tar.gz nixpkgs-e56832d7301f2be7c18abf12d151db00be88f6fa.tar.bz2 nixpkgs-e56832d7301f2be7c18abf12d151db00be88f6fa.tar.lz nixpkgs-e56832d7301f2be7c18abf12d151db00be88f6fa.tar.xz nixpkgs-e56832d7301f2be7c18abf12d151db00be88f6fa.tar.zst nixpkgs-e56832d7301f2be7c18abf12d151db00be88f6fa.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/tools/package-management/nixops')
| -rw-r--r-- | pkgs/tools/package-management/nixops/generic.nix | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index 666efaecfc9..9c4c2600fb4 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -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; |