summary refs log tree commit diff
path: root/pkgs/lib
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2011-10-14 22:06:50 +0000
committerPeter Simons <simons@cryp.to>2011-10-14 22:06:50 +0000
commit8dfef0f4a0478a82f43035b06bd74cfd02f84930 (patch)
treeaac37f0b1447392e410b42ecf42be31a745cbf77 /pkgs/lib
parent909200437c419a0c9bb68c22f8a3439a1837916d (diff)
parentc7cea676ce58f7c0ecb45c612492c1127d9d6962 (diff)
downloadnixlib-8dfef0f4a0478a82f43035b06bd74cfd02f84930.tar
nixlib-8dfef0f4a0478a82f43035b06bd74cfd02f84930.tar.gz
nixlib-8dfef0f4a0478a82f43035b06bd74cfd02f84930.tar.bz2
nixlib-8dfef0f4a0478a82f43035b06bd74cfd02f84930.tar.lz
nixlib-8dfef0f4a0478a82f43035b06bd74cfd02f84930.tar.xz
nixlib-8dfef0f4a0478a82f43035b06bd74cfd02f84930.tar.zst
nixlib-8dfef0f4a0478a82f43035b06bd74cfd02f84930.zip
synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29851
Diffstat (limited to 'pkgs/lib')
-rw-r--r--pkgs/lib/licenses.nix12
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix
index 1d6b1ca58e22..edfa057be7be 100644
--- a/pkgs/lib/licenses.nix
+++ b/pkgs/lib/licenses.nix
@@ -82,6 +82,18 @@
     url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception;
   };
 
+  isc = {
+    shortName = "ISC";
+    fullName = "Internet Systems Consortium License";
+    url = http://www.opensource.org/licenses/ISC;
+  };
+
+  ipl10 = {
+    shortName = "IPL 1.0";
+    fullName = "IBM Public License Version 1.0";
+    url = http://www.ibm.com/developerworks/opensource/library/os-i18n2/os-ipl.html;
+  };
+
   ijg = {
     shortName = "IJG";
     fullName = "Independent JPEG Group License";