diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-12-19 01:42:40 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-12-19 01:42:40 +0100 |
commit | 32cd878be0bb7e153fcaa6f3bfa2632867390ff9 (patch) | |
tree | fc1ff93949817c9d172c84d0410ac9225cad57ae /guix/licenses.scm | |
parent | 753425610274ccb59cce13490c096027c61621d0 (diff) | |
parent | 98bd11cfe7b931e9c6d6bf002a8a225fb7a1025b (diff) |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/licenses.scm')
-rw-r--r-- | guix/licenses.scm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/guix/licenses.scm b/guix/licenses.scm index b07d80076e..269d97c723 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2017 Petter <petter@mykolab.ch> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -91,6 +92,7 @@ zlib fsf-free wtfpl2 + wxwindows3.1+ fsdg-compatible)) (define-record-type <license> @@ -581,6 +583,11 @@ at URI, which may be a file:// URI pointing the package's tree." "http://www.wtfpl.net" "http://www.wtfpl.net/about/")) +(define wxwindows3.1+ + (license "wxWindows 3.1+" + "https://wxwidgets.org/about/licence" + "https://www.gnu.org/licenses/license-list.html#Wxwind")) + (define x11 (license "X11" "http://directory.fsf.org/wiki/License:X11" |