[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
36/155: import cran: Handle BSD licenses with LICENSE file.
From: |
John Darrington |
Subject: |
36/155: import cran: Handle BSD licenses with LICENSE file. |
Date: |
Wed, 21 Dec 2016 20:48:31 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 65275f59bd4dd8eb1fb8531d7e557ed6d348312d
Author: Ricardo Wurmus <address@hidden>
Date: Thu Dec 8 14:37:32 2016 +0100
import cran: Handle BSD licenses with LICENSE file.
* guix/import/cran.scm (string->license): Add cases for BSD licenses
with LICENSE file.
---
guix/import/cran.scm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index 549b11c..d2add6f 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -51,7 +51,9 @@
("Artistic-2.0" 'artistic2.0)
("Apache License 2.0" 'asl2.0)
("BSD_2_clause" 'bsd-2)
+ ("BSD_2_clause + file LICENSE" 'bsd-2)
("BSD_3_clause" 'bsd-3)
+ ("BSD_3_clause + file LICENSE" 'bsd-3)
("GPL" (list 'gpl2+ 'gpl3+))
("GPL (>= 2)" 'gpl2+)
("GPL (>= 3)" 'gpl3+)
- 11/155: installer: Change "interfaces" from a variable to a procedure., (continued)
- 11/155: installer: Change "interfaces" from a variable to a procedure., John Darrington, 2016/12/21
- 21/155: profiles: Build profiles in a UTF-8 locale., John Darrington, 2016/12/21
- 09/155: installer: Use a record instead of a list to contain tasks., John Darrington, 2016/12/21
- 13/155: installer: Use call-with-temporary-output-file., John Darrington, 2016/12/21
- 29/155: gnu: Add fatfsck-static., John Darrington, 2016/12/21
- 24/155: build: assert-no-store-file-names: Ignore ChangeLog., John Darrington, 2016/12/21
- 18/155: install: Add dosfstools., John Darrington, 2016/12/21
- 23/155: gnu: libupnp: Fix CVE-2016-8863., John Darrington, 2016/12/21
- 25/155: gnu: acme-client: Provide path to certificates., John Darrington, 2016/12/21
- 34/155: import cran: Do not use "or later" licenses by default., John Darrington, 2016/12/21
- 36/155: import cran: Handle BSD licenses with LICENSE file.,
John Darrington <=
- 15/155: doc: "Nar" now means "normalized archive"., John Darrington, 2016/12/21
- 14/155: Revert "gnu: kmod: Update to 23.", John Darrington, 2016/12/21
- 22/155: gnu: Add Greek Aspell dictionary, John Darrington, 2016/12/21
- 12/155: installer: Add gurses modules., John Darrington, 2016/12/21
- 35/155: import cran: Translate MIT to the Expat license., John Darrington, 2016/12/21
- 27/155: gnu: Add emacs-bui., John Darrington, 2016/12/21
- 47/155: gnu: sane-backends: Disable backend generation., John Darrington, 2016/12/21
- 17/155: gnu: tor: Recommend torsocks., John Darrington, 2016/12/21
- 10/155: installer: Perform a task's dependencies prior to the task itself., John Darrington, 2016/12/21
- 28/155: gnu: Add emacs-guix., John Darrington, 2016/12/21