gnu: Add r-flowsom.

[jackhill/guix/guix.git] / guix / licenses.scm

diff --git a/guix/licenses.scm b/guix/licenses.scm
index 676e71a..41d4fef 100644 (file)
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2014, 2015, 2017 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2014, 2015, 2017, 2019 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2012, 2013 Nikita Karetnikov <nikita@karetnikov.org>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
@@ -38,7 +38,6 @@
             boost1.0
             bsd-2 bsd-3 bsd-4
             non-copyleft
-            bsd-style                             ;deprecated!
             cc0
             cc-by2.0 cc-by3.0 cc-by4.0
             cc-by-sa2.0 cc-by-sa3.0 cc-by-sa4.0
@@ -65,7 +64,7 @@
             imlib2
             ipa
             knuth
-            lgpl2.0 lgpl2.0+ lgpl2.1 lgpl2.1+ lgpl3 lgpl3+
+            lgpl2.0 lgpl2.0+ lgpl2.1 lgpl2.1+ lgpl3 lgpl3+ llgpl
             lppl lppl1.0+ lppl1.1+ lppl1.2 lppl1.2+
             lppl1.3 lppl1.3+
             lppl1.3a lppl1.3a+
@@ -95,6 +94,7 @@
             fsf-free
             wtfpl2
             wxwindows3.1+
+            hpnd
             fsdg-compatible))
 
 (define-record-type <license>
@@ -170,12 +170,6 @@ at URI, which may be a file:// URI pointing the package's tree."
             "Check the URI for details.  "
             comment)))
 
-(define bsd-style
-  ;; This alias is kept for backward-compatibility.  Do not use it for new
-  ;; packages: it is ambiguous, as rightfully explained at
-  ;; <http://www.gnu.org/philosophy/words-to-avoid.html#BSD-style>.
-  non-copyleft)
-
 (define cc0
   (license "CC0"
            "http://directory.fsf.org/wiki/License:CC0"
@@ -417,6 +411,11 @@ at URI, which may be a file:// URI pointing the package's tree."
            "https://www.gnu.org/licenses/lgpl.html"
            "https://www.gnu.org/licenses/license-list#LGPLv3"))
 
+(define llgpl
+  (license "LLGPL"
+           "https://opensource.franz.com/preamble.html"
+           "Lisp Lesser General Public License"))
+
 (define lppl
   (license "LPPL (any version)"
            "https://www.latex-project.org/lppl/lppl-1-0/"
@@ -630,6 +629,11 @@ which may be a file:// URI pointing the package's tree."
            "http://www.gzip.org/zlib/zlib_license.html"
            "https://www.gnu.org/licenses/license-list#ZLib"))
 
+(define hpnd
+  (license "HPND"
+           "https://directory.fsf.org/wiki/License:HPND"
+           "https://www.gnu.org/licenses/license-list#HPND"))
+
 (define* (fsf-free uri #:optional (comment ""))
   "Return a license that does not fit any of the ones above or a collection
 of licenses, approved as free by the FSF.  More details can be found at URI."