Skip to content

ec2-ami-tools -> 1.5.6, updated license & homepage #4845

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.

Sign up for GitHub

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

Merged
rbvermaa merged 1 commit into from
Nov 5, 2014
Merged

ec2-ami-tools -> 1.5.6, updated license & homepage #4845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions lib/licenses.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
8 changes: 4 additions & 4 deletions pkgs/tools/virtualization/ec2-ami-tools/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Copy link
Member

@edolstra edolstra Nov 5, 2014

Choose a reason for hiding this comment

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

This is not a free software license, so license must be unfree or unfree-redistributable to prevent it from being included in the Nixpkgs/NixOS channels.

Copy link
Contributor Author

@proger proger Nov 5, 2014

Choose a reason for hiding this comment

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

Why isn't it free? There is only a use limitation "3.3 Use Limitation. The Work and any derivative works thereof only may be used or intended for use with the web services, computing platforms or applications provided by Amazon.com, Inc. or its affiliates, including Amazon Web Services, Inc."clause that looks unusual however its application seems to be beyond the scope of nixpkgs

Copy link
Contributor Author

@proger proger Nov 5, 2014

Choose a reason for hiding this comment

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

(i'm no license expert however this license doesn't look any different than most of other licenses from big companies except for that clause)

Copy link
Member

@edolstra edolstra Nov 5, 2014

Choose a reason for hiding this comment

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

Yes, 3.3 is a field of use restriction, which makes it non-free. For instance, it disallows you from using this package with OpenStack. See https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Bad_Licenses.

Copy link
Contributor Author

@proger proger Nov 5, 2014

Choose a reason for hiding this comment

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

is there a hack to tag this license unfree?

Copy link
Contributor Author

@proger proger Nov 5, 2014

Choose a reason for hiding this comment

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

(so i can keep licenses.amazonsl but have nixpkgs recognize it as unfree? i guess naming it smth like "unfree-amazonsl" should do

Copy link
Member

@edolstra edolstra Nov 5, 2014

Choose a reason for hiding this comment

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

Fixed in af0557c.

Copy link
Contributor Author

@proger proger Nov 5, 2014

Choose a reason for hiding this comment

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

great! thanks

};

}