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

Merge pull request #4845 from proger/ec2-ami-tools-1.5.6

Browse Source 
ec2-ami-tools -> 1.5.6, updated license & homepage
This commit is contained in:
Rob Vermaas 2014-11-05 14:30:45 +01:00
commit af2a19426b
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/licenses.nix
View File

@ -21,6 +21,12 @@ rec {
inherit (agpl3) url;
};
amazonsl = {
shortName = "asl";
fullName = "Amazon Software License";
url = http://aws.amazon.com/asl/;
};
amd = {
shortName = "amd";
fullName = "AMD License Agreement";

8
pkgs/tools/virtualization/ec2-ami-tools/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "ec2-ami-tools-${version}";
version = "1.5.3";
version = "1.5.6";
buildInputs = [ unzip makeWrapper ];
src = fetchurl {
url = "http://s3.amazonaws.com/ec2-downloads/${name}.zip";
sha256 = "0n184nxc57alg25h5bslg0cs1z854sf7f52a820ihxxknrq2dy6i";
sha256 = "0227370qbm26qaqvscqxv6002bqwy2i5fdhbhpwfnbymh7jz59ks";
};
# Amazon EC2 requires that disk images are writable. If they're
@ -36,9 +36,9 @@ stdenv.mkDerivation rec {
''; # */
meta = {
homepage = http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368&categoryID=88;
homepage = https://aws.amazon.com/developertools/Amazon-EC2/368;
description = "Command-line tools to create and manage Amazon EC2 virtual machine images";
license = "unfree-redistributable"; # Amazon || (Ruby GPL-2)
license = stdenv.lib.licenses.amazonsl;
};
}