summary refs log tree commit diff
diff options
context:
space:
mode:
authorzimbatm <zimbatm@zimbatm.com>2018-01-15 10:47:52 +0000
committerzimbatm <zimbatm@zimbatm.com>2018-01-15 10:47:52 +0000
commitfad6250276273fd2d87b073d1b9faa2d22574e2a (patch)
treebf571e4496e0a0e79bfd30d65adcd3b07be7d7e3
parent6e84522610598da609f47409c3d7701b709d77cc (diff)
downloadnixpkgs-fad6250276273fd2d87b073d1b9faa2d22574e2a.tar
nixpkgs-fad6250276273fd2d87b073d1b9faa2d22574e2a.tar.gz
nixpkgs-fad6250276273fd2d87b073d1b9faa2d22574e2a.tar.bz2
nixpkgs-fad6250276273fd2d87b073d1b9faa2d22574e2a.tar.lz
nixpkgs-fad6250276273fd2d87b073d1b9faa2d22574e2a.tar.xz
nixpkgs-fad6250276273fd2d87b073d1b9faa2d22574e2a.tar.zst
nixpkgs-fad6250276273fd2d87b073d1b9faa2d22574e2a.zip
Revert "aws_shell: move to pythonPackages"
This reverts commit ffd35a7849f6477eeba9deeea33c8dcc2d582383.
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/python-packages.nix2
2 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ad77d0f98a..9be3a5de5ea 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.aws_shell;
+  aws_shell = pythonPackages.callPackage ../tools/admin/aws_shell { };
 
   aws-vault = callPackage ../tools/admin/aws-vault { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 74d08255cb1..bad68571d3e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -177,8 +177,6 @@ in {
 
   awscli = callPackage ../tools/admin/awscli { };
 
-  aws_shell = callPackage ../tools/admin/aws_shell { };
-
   # packages defined elsewhere
 
   backports_csv = callPackage ../development/python-modules/backports_csv {};