[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
35/155: import cran: Translate MIT to the Expat license.
From: |
John Darrington |
Subject: |
35/155: import cran: Translate MIT to the Expat license. |
Date: |
Wed, 21 Dec 2016 20:48:31 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 484c4112bb88e5ac66ce2ac561dae0f919f19c6e
Author: Ricardo Wurmus <address@hidden>
Date: Thu Dec 8 14:36:27 2016 +0100
import cran: Translate MIT to the Expat license.
* guix/import/cran.scm (string->license): Translate "MIT" license to
Expat license.
---
guix/import/cran.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index 13f5f82..549b11c 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -62,8 +62,8 @@
("LGPL-3" 'lgpl3)
("LGPL (>= 2)" 'lgpl2.0+)
("LGPL (>= 3)" 'lgpl3+)
- ("MIT" 'x11)
- ("MIT + file LICENSE" 'x11)
+ ("MIT" 'expat)
+ ("MIT + file LICENSE" 'expat)
((x) (string->license x))
((lst ...) `(list ,@(map string->license lst)))
(_ #f)))
- 24/155: build: assert-no-store-file-names: Ignore ChangeLog., (continued)
- 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, 2016/12/21
- 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 <=
- 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
- 30/155: gnu: star: Update to 2.5.2b., John Darrington, 2016/12/21
- 46/155: gnu: pinentry: Update to 1.0.0., John Darrington, 2016/12/21
- 52/155: gnu: r: Update to 3.3.2., John Darrington, 2016/12/21
- 44/155: import cran: Handle HTTP errors., John Darrington, 2016/12/21
- 26/155: gnu: imagemagick: Update to 6.9.6-8., John Darrington, 2016/12/21