diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-09-24 19:18:35 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-09-24 19:18:35 +0200 |
commit | ffcff272728e750c62acbbf8322c2ad35d69ad81 (patch) | |
tree | bdab0ab0d8e0ede962fcd0f9a5474f67bb9ed682 /guix | |
parent | 6baf1b72057ccda6e491596ad3715c4f555e6a69 (diff) | |
parent | 030030f4416b54285dcdd58bddb863c0e6bda4c4 (diff) |
Merge branch 'master' into staging
Diffstat (limited to 'guix')
-rw-r--r-- | guix/licenses.scm | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/guix/licenses.scm b/guix/licenses.scm index b7dadd9750..6de611da2b 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -41,6 +41,7 @@ cc0 cc-by2.0 cc-by3.0 cc-by4.0 cc-by-sa2.0 cc-by-sa3.0 cc-by-sa4.0 + cc-sampling-plus-1.0 cddl1.0 cecill cecill-b cecill-c artistic2.0 clarified-artistic @@ -206,6 +207,11 @@ at URI, which may be a file:// URI pointing the package's tree." "http://creativecommons.org/licenses/by/2.0/" "Creative Commons Attribution 2.0 Generic")) +(define cc-sampling-plus-1.0 + (license "CC-Sampling+ 1.0" + "https://creativecommons.org/licenses/sampling+/1.0" + "Creative Commons Sampling Plus 1.0")) + (define cddl1.0 (license "CDDL 1.0" "http://directory.fsf.org/wiki/License:CDDLv1.0" |