[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/07: import cran: Handle BSD licenses with LICENSE file.
From: |
Ricardo Wurmus |
Subject: |
03/07: import cran: Handle BSD licenses with LICENSE file. |
Date: |
Sat, 17 Dec 2016 17:41:25 +0000 (UTC) |
rekado pushed a commit to branch master
in repository guix.
commit 576eda6d02c65cbbbd611691abb5f5ee9511afc6
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+)
- branch master updated (aaee461 -> b26abe4), Ricardo Wurmus, 2016/12/17
- 05/07: import cran: Move guix-name to top-level., Ricardo Wurmus, 2016/12/17
- 03/07: import cran: Handle BSD licenses with LICENSE file.,
Ricardo Wurmus <=
- 07/07: import cran: Ignore default R packages., Ricardo Wurmus, 2016/12/17
- 06/07: import cran: description->package: Also return package dependencies., Ricardo Wurmus, 2016/12/17
- 01/07: import cran: Do not use "or later" licenses by default., Ricardo Wurmus, 2016/12/17
- 04/07: import cran: Remove more invalid characters from package names., Ricardo Wurmus, 2016/12/17
- 02/07: import cran: Translate MIT to the Expat license., Ricardo Wurmus, 2016/12/17