From 29b8e5fb6f64ea93e548a517026f1d1350124003 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 10 Jan 2018 15:40:39 +0000 Subject: [PATCH] awscli: move to pythonPackages This allows to have awscli running both under python 2 and 3 as necessary. --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3edd6d5855..736288e9d17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -533,7 +533,7 @@ with pkgs; avfs = callPackage ../tools/filesystems/avfs { }; - awscli = pythonPackages.callPackage ../tools/admin/awscli { }; + awscli = pythonPackages.awscli; awsebcli = callPackage ../tools/virtualization/awsebcli {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 06f83371509..9134bf41cb2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -175,6 +175,8 @@ in { aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; + awscli = callPackage ../tools/admin/awscli { }; + # packages defined elsewhere backports_csv = callPackage ../development/python-modules/backports_csv {};