From ffd35a7849f6477eeba9deeea33c8dcc2d582383 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 10 Jan 2018 15:43:11 +0000 Subject: [PATCH] aws_shell: 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 736288e9d17..c951a0abe25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -539,7 +539,7 @@ with pkgs; awslogs = callPackage ../tools/admin/awslogs { }; - aws_shell = pythonPackages.callPackage ../tools/admin/aws_shell { }; + aws_shell = pythonPackages.aws_shell; azure-cli = nodePackages.azure-cli; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9134bf41cb2..d301c767b30 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -177,6 +177,8 @@ in { awscli = callPackage ../tools/admin/awscli { }; + aws_shell = callPackage ../tools/admin/aws_shell { }; + # packages defined elsewhere backports_csv = callPackage ../development/python-modules/backports_csv {};