me/guix
Archived
1
0
Fork 0
Code Activity

licenses: Rename 'bsd-style' to 'non-copyleft'.

Browse source 
* guix/licenses.scm (bsd-style): Rename to...
  (non-copyleft): ... this.  Clarify docstring.
  (bsd-style): Introduce as an alias for 'non-copyleft'.
This commit is contained in:
Ludovic Courtès 2015-03-14 19:25:00 +01:00
parent c463dd4763
commit b3345dc41a
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
guix/licenses.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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 © 2013, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2012, 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2012, 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; ;;;
@ -24,7 +24,9 @@
agpl3 agpl3+ agpl3 agpl3+
asl2.0 asl2.0
boost1.0 boost1.0
bsd-2 bsd-3 bsd-4 bsd-style bsd-2 bsd-3 bsd-4
non-copyleft
bsd-style ;deprecated!
cc0 cc0
cddl1.0 cddl1.0
cecill-c cecill-c
@ -105,16 +107,23 @@
"http://directory.fsf.org/wiki/License:BSD_4Clause" "http://directory.fsf.org/wiki/License:BSD_4Clause"
"https://www.gnu.org/licenses/license-list#OriginalBSD")) "https://www.gnu.org/licenses/license-list#OriginalBSD"))
(define* (bsd-style uri #:optional (comment "")) (define* (non-copyleft uri #:optional (comment ""))
"Return a BSD-style license, whose full text can be found at URI, "Return a lax, permissive, non-copyleft license (for example a variant of
which may be a file:// URI pointing the package's tree." the 3-clause BSD license or the Expat license), whose full text can be found
(license "BSD-style" at URI, which may be a file:// URI pointing the package's tree."
(license "non-copyleft"
uri uri
(string-append (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. " "Check the URI for details. "
comment))) 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 (define cc0
(license "CC0" (license "CC0"
"http://directory.fsf.org/wiki/License:CC0" "http://directory.fsf.org/wiki/License:CC0"