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

* Use a fork of Net::Amazon::EC2 that supports tags.

Browse Source 
svn path=/nixpkgs/trunk/; revision=30073
This commit is contained in:
Eelco Dolstra 2011-10-27 21:45:53 +00:00
parent f4c75d125b
commit 34117268d2
2 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/development/perl-modules/net-amazon-ec2-ipv6.patch
View File

@ -1,8 +1,6 @@
Support OpenStack's DescribeInstancesV6 API call. diff -ru stanaka-net-amazon-ec2-bc66577-orig/lib/Net/Amazon/EC2/RunningInstances.pm stanaka-net-amazon-ec2-bc66577/lib/Net/Amazon/EC2/RunningInstances.pm
--- stanaka-net-amazon-ec2-bc66577-orig/lib/Net/Amazon/EC2/RunningInstances.pm 2011-06-13 19:45:30.000000000 -0400
diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2/RunningInstances.pm Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2/RunningInstances.pm +++ stanaka-net-amazon-ec2-bc66577/lib/Net/Amazon/EC2/RunningInstances.pm 2011-10-27 17:25:29.000000000 -0400
--- Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2/RunningInstances.pm 2010-01-24 02:12:50.000000000 +0100
+++ Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2/RunningInstances.pm 2011-06-21 17:19:36.000000000 +0200
@@ -25,6 +25,10 @@ @@ -25,6 +25,10 @@
This element remains empty until the instance enters a This element remains empty until the instance enters a
running state. running state.
@ -14,7 +12,7 @@ diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2/RunningInstances.
=item image_id (required) =item image_id (required)
The image id of the AMI currently running in this instance. The image id of the AMI currently running in this instance.
@@ -126,6 +130,7 @@ @@ -134,6 +138,7 @@
has 'ami_launch_index' => ( is => 'ro', isa => 'Str', required => 0 ); has 'ami_launch_index' => ( is => 'ro', isa => 'Str', required => 0 );
has 'dns_name' => ( is => 'ro', isa => 'Maybe[Str]', required => 0 ); has 'dns_name' => ( is => 'ro', isa => 'Maybe[Str]', required => 0 );
@ -22,10 +20,10 @@ diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2/RunningInstances.
has 'image_id' => ( is => 'ro', isa => 'Str', required => 1 ); has 'image_id' => ( is => 'ro', isa => 'Str', required => 1 );
has 'kernel_id' => ( is => 'ro', isa => 'Maybe[Str]', required => 1 ); has 'kernel_id' => ( is => 'ro', isa => 'Maybe[Str]', required => 1 );
has 'ramdisk_id' => ( is => 'ro', isa => 'Maybe[Str]', required => 1 ); has 'ramdisk_id' => ( is => 'ro', isa => 'Maybe[Str]', required => 1 );
diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2.pm Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2.pm diff -ru stanaka-net-amazon-ec2-bc66577-orig/lib/Net/Amazon/EC2.pm stanaka-net-amazon-ec2-bc66577/lib/Net/Amazon/EC2.pm
--- Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2.pm 2011-06-16 16:11:53.000000000 +0200 --- stanaka-net-amazon-ec2-bc66577-orig/lib/Net/Amazon/EC2.pm 2011-06-13 19:45:30.000000000 -0400
+++ Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2.pm 2011-10-20 20:13:12.585277245 +0200 +++ stanaka-net-amazon-ec2-bc66577/lib/Net/Amazon/EC2.pm 2011-10-27 17:25:29.000000000 -0400
@@ -1542,6 +1542,7 @@ @@ -1691,6 +1691,7 @@
my $self = shift; my $self = shift;
my %args = validate( @_, { my %args = validate( @_, {
InstanceId => { type => SCALAR | ARRAYREF, optional => 1 }, InstanceId => { type => SCALAR | ARRAYREF, optional => 1 },
@ -33,8 +31,8 @@ diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2.pm Net-Amazon-EC2
}); });
# If we have a array ref of instances lets split them out into their InstanceId.n format # If we have a array ref of instances lets split them out into their InstanceId.n format
@@ -1556,7 +1557,8 @@ @@ -1703,7 +1704,8 @@
$args{"InstanceId.1"} = delete $args{InstanceId}; }
} }
- my $xml = $self->_sign(Action => 'DescribeInstances', %args); - my $xml = $self->_sign(Action => 'DescribeInstances', %args);
@ -43,7 +41,7 @@ diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2.pm Net-Amazon-EC2
my $reservations; my $reservations;
if ( grep { defined && length } $xml->{Errors} ) { if ( grep { defined && length } $xml->{Errors} ) {
@@ -1635,6 +1637,7 @@ @@ -1791,6 +1793,7 @@
my $running_instance = Net::Amazon::EC2::RunningInstances->new( my $running_instance = Net::Amazon::EC2::RunningInstances->new(
ami_launch_index => $instance_elem->{amiLaunchIndex}, ami_launch_index => $instance_elem->{amiLaunchIndex},
dns_name => $instance_elem->{dnsName}, dns_name => $instance_elem->{dnsName},
@ -51,10 +49,3 @@ diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2.pm Net-Amazon-EC2
image_id => $instance_elem->{imageId}, image_id => $instance_elem->{imageId},
kernel_id => $instance_elem->{kernelId}, kernel_id => $instance_elem->{kernelId},
ramdisk_id => $instance_elem->{ramdiskId}, ramdisk_id => $instance_elem->{ramdiskId},
@@ -3866,4 +3869,4 @@
=head1 SEE ALSO
-Amazon EC2 API: L<http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/>
\ No newline at end of file
+Amazon EC2 API: L<http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/>

8
pkgs/top-level/perl-packages.nix
View File

@ -2402,11 +2402,13 @@ rec {
}; };
NetAmazonEC2 = buildPerlPackage rec { NetAmazonEC2 = buildPerlPackage rec {
name = "Net-Amazon-EC2-0.14"; name = "Net-Amazon-EC2-0.14-stanaka-bc66577e13";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/J/JK/JKIM/${name}.tar.gz"; url = https://github.com/stanaka/net-amazon-ec2/zipball/bc66577e1312e828e252937d95f9f5f637af6a0b;
sha256 = "14am9m19ziyv12bjxljhfyl0zy120yf4gligsa9v26smb61fxyjr"; sha256 = "1c0k3addkaaf4zj7z87svm9xc3c06v0r06rf5rpqmps413lqisbn";
name = "${name}.zip";
}; };
buildInputs = [ pkgs.unzip ];
patches = patches =
[ # In DescribeInstance requests, say "InstanceId.1" instead of [ # In DescribeInstance requests, say "InstanceId.1" instead of
# "InstanceId", as required by the Amazon spec. EC2 tolerates # "InstanceId", as required by the Amazon spec. EC2 tolerates