diff options
author | adisbladis <adis@blad.is> | 2017-11-11 00:59:25 +0800 |
---|---|---|
committer | adisbladis <adis@blad.is> | 2017-11-11 02:35:42 +0800 |
commit | 689f385923940f5d047fe20b5e76bd3a3e128cc8 (patch) | |
tree | eab8c267eb9c5999baa2bece6080aa4dfe36bae7 | |
parent | ac3a328e0740cbfef7c4b3ebdf472784fdedb3b0 (diff) | |
download | nixpkgs-689f385923940f5d047fe20b5e76bd3a3e128cc8.tar nixpkgs-689f385923940f5d047fe20b5e76bd3a3e128cc8.tar.gz nixpkgs-689f385923940f5d047fe20b5e76bd3a3e128cc8.tar.bz2 nixpkgs-689f385923940f5d047fe20b5e76bd3a3e128cc8.tar.lz nixpkgs-689f385923940f5d047fe20b5e76bd3a3e128cc8.tar.xz nixpkgs-689f385923940f5d047fe20b5e76bd3a3e128cc8.tar.zst nixpkgs-689f385923940f5d047fe20b5e76bd3a3e128cc8.zip |
aws_shell: Move out of python-packages.nix
-rw-r--r-- | pkgs/tools/admin/aws_shell/default.nix | 42 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 31 |
3 files changed, 43 insertions, 32 deletions
diff --git a/pkgs/tools/admin/aws_shell/default.nix b/pkgs/tools/admin/aws_shell/default.nix new file mode 100644 index 00000000000..6eee9826948 --- /dev/null +++ b/pkgs/tools/admin/aws_shell/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, awscli +, prompt_toolkit +, boto3 +, configobj +, pygments +}: + +buildPythonPackage rec { + pname = "aws-shell"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1pw9lrdjl24n6lrs6lnqpyiyic8bdxgvhyqvb2rx6kkbjrfhhgv5"; + }; + + # Why does it propagate packages that are used for testing? + propagatedBuildInputs = [ + awscli + prompt_toolkit + boto3 + configobj + pygments + ]; + + #Checks are failing due to missing TTY, which won't exist. + doCheck = false; + preCheck = '' + mkdir -p check-phase + export HOME=$(pwd)/check-phase + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/awslabs/aws-shell; + description = "An integrated shell for working with the AWS CLI"; + license = licenses.asl20; + maintainers = [ ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b71653f255..21eff14d3de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -517,7 +517,7 @@ with pkgs; awslogs = callPackage ../tools/admin/awslogs { }; - aws_shell = python2Packages.aws_shell; # Should be moved out of python-packages.nix + aws_shell = pythonPackages.callPackage ../tools/admin/aws_shell { }; azure-cli = nodePackages.azure-cli; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 561ceeff4b0..22b93af8cff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -789,37 +789,6 @@ in { }; }; - aws_shell = buildPythonPackage rec { - name = "aws-shell-${version}"; - version = "0.1.1"; - src = pkgs.fetchurl { - sha256 = "1pw9lrdjl24n6lrs6lnqpyiyic8bdxgvhyqvb2rx6kkbjrfhhgv5"; - url = "mirror://pypi/a/aws-shell/aws-shell-${version}.tar.gz"; - }; - - # Why does it propagate packages that are used for testing? - propagatedBuildInputs = with self; [ - awscli prompt_toolkit boto3 configobj pygments - ]; - - #Checks are failing due to missing TTY, which won't exist. - doCheck = false; - preCheck = '' - mkdir -p check-phase - export HOME=$(pwd)/check-phase - ''; - - disabled = isPy35; - - - meta = { - homepage = https://github.com/awslabs/aws-shell; - description = "An integrated shell for working with the AWS CLI"; - license = licenses.asl20; - maintainers = [ ]; - }; - }; - azure = buildPythonPackage rec { version = "0.11.0"; name = "azure-${version}"; |