public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

awscli: refactor

Browse Source
This commit is contained in:
Robert Schütz 2018-02-27 09:26:19 +01:00
parent 6617c0cc30
commit ae870798dc
2 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pkgs/tools/admin/awscli/default.nix
View File

@ -1,35 +1,27 @@
{ stdenv { lib
, buildPythonPackage , python
, fetchPypi
, botocore
, bcdoc
, s3transfer
, six
, colorama
, docutils
, rsa
, pyyaml
, groff , groff
, less , less
}: }:
let let
colorama_3_7 = colorama.overrideAttrs (old: rec { py = python.override {
name = "${pname}-${version}"; packageOverrides = self: super: {
pname = "colorama"; colorama = super.colorama.overridePythonAttrs (oldAttrs: rec {
version = "0.3.7"; version = "0.3.7";
src = old.src.override { src = oldAttrs.src.override {
inherit version; inherit version;
sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0"; sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0";
};
});
}; };
}); };
in buildPythonPackage rec { in py.pkgs.buildPythonApplication rec {
pname = "awscli"; pname = "awscli";
version = "1.14.47"; version = "1.14.47";
namePrefix = "";
src = fetchPypi { src = py.pkgs.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "269483910c820ae5b4f60021375f07e4f1c23f86505e1b9e29243880a660c1d8"; sha256 = "269483910c820ae5b4f60021375f07e4f1c23f86505e1b9e29243880a660c1d8";
}; };
@ -37,12 +29,12 @@ in buildPythonPackage rec {
# No tests included # No tests included
doCheck = false; doCheck = false;
propagatedBuildInputs = [ propagatedBuildInputs = with py.pkgs; [
botocore botocore
bcdoc bcdoc
s3transfer s3transfer
six six
colorama_3_7 colorama
docutils docutils
rsa rsa
pyyaml pyyaml
@ -58,10 +50,10 @@ in buildPythonPackage rec {
rm $out/bin/aws.cmd rm $out/bin/aws.cmd
''; '';
meta = with stdenv.lib; { meta = with lib; {
homepage = https://aws.amazon.com/cli/; homepage = https://aws.amazon.com/cli/;
description = "Unified tool to manage your AWS services"; description = "Unified tool to manage your AWS services";
license = stdenv.lib.licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ muflax ]; maintainers = with maintainers; [ muflax ];
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -552,7 +552,7 @@ with pkgs;
avfs = callPackage ../tools/filesystems/avfs { }; avfs = callPackage ../tools/filesystems/avfs { };
awscli = pythonPackages.callPackage ../tools/admin/awscli { }; awscli = callPackage ../tools/admin/awscli { };
awsebcli = callPackage ../tools/virtualization/awsebcli {}; awsebcli = callPackage ../tools/virtualization/awsebcli {};