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

Merge branch 'master' into x-updates

Browse Source 
Conflicts:
	pkgs/development/compilers/vala/default.nix (it's different version)
	pkgs/development/libraries/cairo/default.nix (trivial)
This commit is contained in:
Vladimír Čunát
2013-04-17 18:26:28 +02:00
parent 6bd036d5f9 3f0ee819e2
commit ec736312d4
58 changed files with 13065 additions and 2819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/lib/licenses.nix
View File

@@ -183,19 +183,25 @@
url = http://www.tcl.tk/software/tcltk/license.html;
};
unfree = {
shortName = "unfree";
fullName = "unfree non-redistributable license";
};
unfree = "unfree";
unfreeRedistributable = {
shortName = "unfree-redistributable";
fullName = "unfree redistributable license";
};
unfreeRedistributable = "unfree-redistributable";
zlib = {
shortName = "zlib";
fullName = "zlib license";
url = http://www.gzip.org/zlib/zlib_license.html;
};
zpt20 = {
shortName = "ZPT2.0";
fullName = "Zope Public License 2.0";
url = "http://old.zope.org/Resources/License/ZPL-2.0";
};
zpt21 = {
shortName = "ZPT2.1";
fullName = "Zope Public License 2.1";
url = "http://old.zope.org/Resources/License/ZPL-2.1";
};
}