diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
| commit | 8d59c262ada2e2167196a8fb8cbebd9c329a79dd (patch) | |
| tree | 85a74de8cc23a2f0179c0b9f0adfa4c274449a0c /guix/licenses.scm | |
| parent | e7f0835b07d868fd447aa64c873174fa385e1699 (diff) | |
| parent | a068ed6a5f5b3535fce49ac4eca1fec82edd6fdc (diff) | |
| download | guix-patches-8d59c262ada2e2167196a8fb8cbebd9c329a79dd.tar guix-patches-8d59c262ada2e2167196a8fb8cbebd9c329a79dd.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/algebra.scm
gnu/packages/bioinformatics.scm
gnu/packages/curl.scm
gnu/packages/docbook.scm
gnu/packages/emacs-xyz.scm
gnu/packages/maths.scm
gnu/packages/plotutils.scm
gnu/packages/python-web.scm
gnu/packages/python-xyz.scm
gnu/packages/radio.scm
gnu/packages/readline.scm
gnu/packages/tls.scm
gnu/packages/xml.scm
gnu/packages/xorg.scm
Diffstat (limited to 'guix/licenses.scm')
| -rw-r--r-- | guix/licenses.scm | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/guix/licenses.scm b/guix/licenses.scm index 4718ccf83f..e7457799ce 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2020 André Batista <nandre@riseup.net> ;;; Copyright © 2020 Helio Machado <0x2b3bfa0+guix@googlemail.com> ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net> +;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,7 +41,7 @@ apsl2 asl1.1 asl2.0 boost1.0 - bsd-0 bsd-2 bsd-3 bsd-4 + bsd-0 bsd-1 bsd-2 bsd-3 bsd-4 non-copyleft cc0 cc-by2.0 cc-by3.0 cc-by4.0 @@ -166,6 +167,11 @@ "https://spdx.org/licenses/0BSD.html" "https://opensource.org/licenses/0BSD")) +(define bsd-1 + (license "BSD 1-Clause" + "https://spdx.org/licenses/BSD-1-Clause.html" + "https://opensource.org/licenses/BSD-1-Clause")) + (define bsd-2 (license "FreeBSD" "http://directory.fsf.org/wiki/License:FreeBSD" |