summaryrefslogtreecommitdiff
path: root/guix/licenses.scm
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2016-03-21 12:22:31 -0400
committerLeo Famulari <leo@famulari.name>2016-03-21 12:22:31 -0400
commit09ec508a4c14d1bc09622d98f796548d79ab0552 (patch)
tree86cc5a2a67d35ad796bfa33d67869d670d65822e /guix/licenses.scm
parent2dbed47f5c09347c9af42c5f5bacfccbc1ab4aff (diff)
parent71cafa0472a15f2234e24d3c6d8019ebb38685b0 (diff)
downloadguix-patches-09ec508a4c14d1bc09622d98f796548d79ab0552.tar
guix-patches-09ec508a4c14d1bc09622d98f796548d79ab0552.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/licenses.scm')
-rw-r--r--guix/licenses.scm7
1 files changed, 6 insertions, 1 deletions
diff --git a/guix/licenses.scm b/guix/licenses.scm
index 61e679358a..71c0736223 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -28,7 +28,7 @@
#:use-module (srfi srfi-9)
#:export (license? license-name license-uri license-comment
agpl3 agpl3+
- asl2.0
+ asl1.1 asl2.0
boost1.0
bsd-2 bsd-3 bsd-4
non-copyleft
@@ -100,6 +100,11 @@
"https://gnu.org/licenses/agpl.html"
"https://gnu.org/licenses/why-affero-gpl.html"))
+(define asl1.1
+ (license "ASL 1.1"
+ "http://directory.fsf.org/wiki/License:Apache1.1"
+ "https://www.gnu.org/licenses/license-list#apache1"))
+
(define asl2.0
(license "ASL 2.0"
"http://directory.fsf.org/wiki/License:Apache2.0"