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

meta.license is a list of strings (not attribute sets)

Browse Source 
http://hydra.nixos.org/build/5453648
This commit is contained in:
Eelco Dolstra 2013-07-03 12:41:27 +02:00
parent e84ba407f9
commit 80213cbb05
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/lib/licenses.nix
View File

@ -4,8 +4,7 @@
* add it to this list. The URL mentioned above is a good source for inspiration. * add it to this list. The URL mentioned above is a good source for inspiration.
*/ */
agpl3 = { agpl3 = "AGPLv3";
shortName = "AGPLv3";
fullName = "GNU Affero General Public License version 3 only"; fullName = "GNU Affero General Public License version 3 only";
url = https://www.gnu.org/licenses/agpl.html; url = https://www.gnu.org/licenses/agpl.html;
}; };
@ -76,11 +75,7 @@
url = http://www.eclipse.org/legal/epl-v10.html; url = http://www.eclipse.org/legal/epl-v10.html;
}; };
gpl2 = { gpl2 = "GPLv2";
shortName = "GPLv2";
fullName = "GNU General Public License version 2 only";
url = http://www.gnu.org/licenses/old-licenses/gpl-2.0.html;
};
gpl2Oss = { gpl2Oss = {
shortName = "GPLv2+OSS"; shortName = "GPLv2+OSS";
@ -136,11 +131,7 @@
url = https://fedoraproject.org/wiki/Licensing/libtiff; url = https://fedoraproject.org/wiki/Licensing/libtiff;
}; };
lgpl2 = { lgpl2 = "LGPLv2";
shortName = "LGPLv2";
fullName = "GNU Library General Public License version 2";
url = http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html;
};
lgpl2Plus = { lgpl2Plus = {
shortName = "LGPLv2+"; shortName = "LGPLv2+";
@ -148,11 +139,7 @@
url = http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html; url = http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html;
}; };
lgpl21 = { lgpl21 = "LGPLv2.1";
shortName = "LGPLv2.1";
fullName = "GNU Lesser General Public License version 2.1 only";
url = http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html;
};
lgpl21Plus = { lgpl21Plus = {
shortName = "LGPLv2.1+"; shortName = "LGPLv2.1+";

6
pkgs/tools/networking/haproxy/default.nix
View File

@ -18,12 +18,12 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications."; description = "HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications.";
homepage = "http://haproxy.1wt.eu"; homepage = http://haproxy.1wt.eu;
maintainers = [ stdenv.lib.maintainers.garbas ]; maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
license = [ license = [
pkgs.lib.licenses.gpl2 stdenv.lib.licenses.gpl2
pkgs.lib.licenses.lgpl21 stdenv.lib.licenses.lgpl21
]; ];
}; };
} }