X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=LICENSE;h=9927645bda49faeac6f89c53e81d3587e60d16a1;hb=1ded2c9515562bbe3a231f7cb66a931cf7513718;hp=2a1ebe45a3a2c35591bc4bea62a64789670c23dd;hpb=d907c82167d095f5ac0cda0976fff3d403376cbc;p=ghc-base.git

diff --git a/LICENSE b/LICENSE
index 2a1ebe4..9927645 100644
--- a/LICENSE
+++ b/LICENSE
@@ -12,6 +12,9 @@ sources:
     which is (c) Manuel M. T. Chakravarty and freely redistributable
     (but see the full license for restrictions).
 
+  * Code from the Parsec library which is (c) Daan Leijen, and
+    distributable under a BSD-style license (see below).
+
 The full text of these licenses is reproduced below.
 
 -----------------------------------------------------------------------------
@@ -80,3 +83,28 @@ the following license:
   be a definition of the Haskell 98 Foreign Function Interface.
 
 -----------------------------------------------------------------------------
+
+Code derived from Daan Leijen's Parsec is distributed under the following
+license:
+
+  Copyright 1999-2000, Daan Leijen. All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+This software is provided by the copyright holders "as is" and any express or
+implied warranties, including, but not limited to, the implied warranties of
+merchantability and fitness for a particular purpose are disclaimed. In no
+event shall the copyright holders be liable for any direct, indirect,
+incidental, special, exemplary, or consequential damages (including, but not
+limited to, procurement of substitute goods or services; loss of use, data,
+or profits; or business interruption) however caused and on any theory of
+liability, whether in contract, strict liability, or tort (including
+negligence or otherwise) arising in any way out of the use of this software,
+even if advised of the possibility of such damage.