From 403e59420710d8221a3d3ce47be1d15b4d9dcb3d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 25 Jul 2012 15:35:51 -0400
Subject: [PATCH] ec2-ami-tools: Update to 1.6.0.0

---
 .../{amazon-ec2-ami-tools => ec2-ami-tools}/default.nix   | 4 ++--
 .../writable.patch                                        | 0
 .../{amazon-ec2-api-tools => ec2-api-tools}/default.nix   | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename pkgs/tools/virtualization/{amazon-ec2-ami-tools => ec2-ami-tools}/default.nix (93%)
 rename pkgs/tools/virtualization/{amazon-ec2-ami-tools => ec2-ami-tools}/writable.patch (100%)
 rename pkgs/tools/virtualization/{amazon-ec2-api-tools => ec2-api-tools}/default.nix (75%)

diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix
similarity index 93%
rename from pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
rename to pkgs/tools/virtualization/ec2-ami-tools/default.nix
index b05596ed50ac..1420ab5eeeb0 100644
--- a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
+++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "ec2-ami-tools-1.4.0.7";
   
   buildInputs = [ unzip makeWrapper ];
   
   src = fetchurl {
-    url = http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools.zip;
+    url = "http://nixos.org/tarballs/${name}.zip";
     sha256 = "0l8c623i1w30bh9k622cdjj5f57rlfc1zs0i01ya016ijyr08qip";
   };
 
diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch b/pkgs/tools/virtualization/ec2-ami-tools/writable.patch
similarity index 100%
rename from pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch
rename to pkgs/tools/virtualization/ec2-ami-tools/writable.patch
diff --git a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix
similarity index 75%
rename from pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix
rename to pkgs/tools/virtualization/ec2-api-tools/default.nix
index a85d4223b714..22669c67b121 100644
--- a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix
+++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unzip, makeWrapper, jre }:
 
-stdenv.mkDerivation {
-  name = "ec2-api-tools-1.5.3.0";
+stdenv.mkDerivation rec {
+  name = "ec2-api-tools-1.6.0.0";
   
   src = fetchurl {
-    url = http://s3.amazonaws.com/ec2-downloads/ec2-api-tools.zip;
-    sha256 = "15mxjay8pr6cvlmp9hdsg5z7zc15bicjrc30f27rknq72zyhxi8h";
+    url = "http://nixos.org/tarballs/${name}.zip";
+    sha256 = "1j9isvi6g68zhk7zxs29yad2d0rpnbqx8fz25yn5paqx9c8pzqcl";
   };
 
   buildInputs = [ unzip makeWrapper ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 292900b242bd..bf3e058b30dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -383,9 +383,9 @@ let
     };
   };
 
-  ec2apitools = callPackage ../tools/virtualization/amazon-ec2-api-tools { };
+  ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { };
 
-  ec2amitools = callPackage ../tools/virtualization/amazon-ec2-ami-tools { };
+  ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { };
 
   altermime = callPackage ../tools/networking/altermime {};