summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-08-15 02:15:14 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-08-15 02:15:14 +0200
commitdf7bc53606bd7576232e2fe25e404789b5a2389a (patch)
tree623aa9c3b27b47c1153fd207ee051200153861d1 /lib
parent36bef2b26731a9580260fd24d18c90dbecd5eb22 (diff)
parent785ed2b528322676a256fc14a2201773626f46bb (diff)
downloadnixlib-df7bc53606bd7576232e2fe25e404789b5a2389a.tar
nixlib-df7bc53606bd7576232e2fe25e404789b5a2389a.tar.gz
nixlib-df7bc53606bd7576232e2fe25e404789b5a2389a.tar.bz2
nixlib-df7bc53606bd7576232e2fe25e404789b5a2389a.tar.lz
nixlib-df7bc53606bd7576232e2fe25e404789b5a2389a.tar.xz
nixlib-df7bc53606bd7576232e2fe25e404789b5a2389a.tar.zst
nixlib-df7bc53606bd7576232e2fe25e404789b5a2389a.zip
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'lib')
-rw-r--r--lib/licenses.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix
index 29144264ddd2..02618f1c6ca7 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -184,6 +184,11 @@ rec {
     url = http://opensource.franz.com/preamble.html;
   };
 
+  lpl-102 = spdx {
+    shortName = "LPL-1.02";
+    fullName = "Lucent Public License v1.02";
+  };
+
   mit = spdx {
     shortName = "MIT";
     fullName = "MIT License";