diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-03-14 19:25:00 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-03-14 19:27:13 +0100 |
| commit | b3345dc41abd81b048d9e712db235dfd404e1bfe (patch) | |
| tree | 2d6247c2490bc825e6dc92f5a9384191b19469bb | |
| parent | c463dd47633e634db488e9da6e33f85a241c6fa5 (diff) | |
| download | patches-b3345dc41abd81b048d9e712db235dfd404e1bfe.tar patches-b3345dc41abd81b048d9e712db235dfd404e1bfe.tar.gz | |
licenses: Rename 'bsd-style' to 'non-copyleft'.
* guix/licenses.scm (bsd-style): Rename to...
(non-copyleft): ... this. Clarify docstring.
(bsd-style): Introduce as an alias for 'non-copyleft'.
| -rw-r--r-- | guix/licenses.scm | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/guix/licenses.scm b/guix/licenses.scm index 157e74bf37..dfc8c6a031 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2014 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2012, 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; @@ -24,7 +24,9 @@ agpl3 agpl3+ asl2.0 boost1.0 - bsd-2 bsd-3 bsd-4 bsd-style + bsd-2 bsd-3 bsd-4 + non-copyleft + bsd-style ;deprecated! cc0 cddl1.0 cecill-c @@ -105,16 +107,23 @@ "http://directory.fsf.org/wiki/License:BSD_4Clause" "https://www.gnu.org/licenses/license-list#OriginalBSD")) -(define* (bsd-style uri #:optional (comment "")) - "Return a BSD-style license, whose full text can be found at URI, -which may be a file:// URI pointing the package's tree." - (license "BSD-style" +(define* (non-copyleft uri #:optional (comment "")) + "Return a lax, permissive, non-copyleft license (for example a variant of +the 3-clause BSD license or the Expat license), whose full text can be found +at URI, which may be a file:// URI pointing the package's tree." + (license "non-copyleft" uri (string-append - "This is a BSD-style, non-copyleft free software license. " + "This is a lax, non-copyleft free software license. " "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" |