From e10a8b731813a1ce1192e22bde7b9fb3551dfd23 Mon Sep 17 00:00:00 2001
From: Vladimir Kirillov <proger@wilab.org.ua>
Date: Wed, 5 Nov 2014 15:28:52 +0200
Subject: [PATCH] ec2-ami-tools -> 1.5.6, updated license & homepage

---
 lib/licenses.nix                                    | 6 ++++++
 pkgs/tools/virtualization/ec2-ami-tools/default.nix | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index da5cc3a927df..ed1b1469ae99 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -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";
diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix
index cbe53326339a..dad581c93d06 100644
--- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix
+++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix
@@ -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;
   };
 
 }