Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

awscli: 1.11.162 -> 1.11.185 #31488

Merged
merged 4 commits into from Nov 10, 2017
Merged

awscli: 1.11.162 -> 1.11.185 #31488

merged 4 commits into from Nov 10, 2017

Conversation

adisbladis
Copy link
Member

@adisbladis adisbladis commented Nov 10, 2017

Motivation for this change

Upstream API updates.

Had to update botocore and s3transfer for this.

awscli and aws_shell no longer lives in pythonPackages.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.


awsebcli = callPackage ../tools/virtualization/awsebcli {};

awslogs = callPackage ../tools/admin/awslogs { };

aws_shell = python2Packages.aws_shell; # Should be moved out of python-packages.nix
aws_shell = callPackage ../tools/admin/aws_shell { };
Copy link
Contributor

@orivej orivej Nov 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is better to use pythonPackages.callPackage, and list python dependencies in the arguments of the function that returns the derivation.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree. This is now changed.

feedgen = callPackage ../development/python-modules/feedgen { };

feedgenerator = callPackage ../development/python-modules/feedgenerator {
inherit (pkgs) glibcLocales;
};

s3transfer = callPackage ../development/python-modules/s3transfer { };
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe you didn't mean to move s3transfer here from its old place far below?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not intentional. Fixed!

@orivej orivej merged commit fc22a01 into NixOS:master Nov 10, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants