summary refs log tree commit diff
diff options
context:
space:
mode:
authorRicardo Wurmus <ricardo.wurmus@mdc-berlin.de>2015-12-03 15:00:43 +0100
committerRicardo Wurmus <ricardo.wurmus@mdc-berlin.de>2015-12-11 15:35:07 +0100
commitb6a222757bfebdbf3b907b39f1c3b42967aaa915 (patch)
tree4398b36baa357035c6f628f21d10f8500e8c3285
parent5f7e17bef7083496d590e396324db13708fc6cd7 (diff)
downloadguix-b6a222757bfebdbf3b907b39f1c3b42967aaa915.tar.gz
import: cran: Match more license strings.
* guix/import/cran.scm (string->license): Match more license strings to
  license symbols.
-rw-r--r--guix/import/cran.scm6
1 files changed, 6 insertions, 0 deletions
diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index 4b53d5e2c2..43dc2c80b6 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -51,12 +51,18 @@
    ("Apache License 2.0" 'asl2.0)
    ("BSD_2_clause" 'bsd-2)
    ("BSD_3_clause" 'bsd-3)
+   ("GPL" (list 'gpl2+ 'gpl3+))
+   ("GPL (>= 2)" 'gpl2+)
+   ("GPL (>= 3)" 'gpl3+)
    ("GPL-2" 'gpl2+)
    ("GPL-3" 'gpl3+)
    ("LGPL-2" 'lgpl2.0+)
    ("LGPL-2.1" 'lgpl2.1+)
    ("LGPL-3" 'lgpl3+)
+   ("LGPL (>= 2)" 'lgpl2.0+)
+   ("LGPL (>= 3)" 'lgpl3+)
    ("MIT" 'x11)
+   ("MIT + file LICENSE" 'x11)
    ((x) (string->license x))
    ((lst ...) `(list ,@(map string->license lst)))
    (_ #f)))