jmd pushed a commit to branch wip-installer
in repository guix.

commit 65275f59bd4dd8eb1fb8531d7e557ed6d348312d
Author: Ricardo Wurmus <[email protected]>
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+)

Reply via email to