diff options
| author | Marius Bakke <marius@gnu.org> | 2021-08-01 23:23:32 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-08-01 23:23:32 +0200 |
| commit | d2e102d4e4fc5288d93e1100e86b35938a9ac162 (patch) | |
| tree | b5ec688c954f7736c17371d9c76ff30509e8e6e8 /guix | |
| parent | b2a5a180cfa56e55bc8078d606a971e34e326967 (diff) | |
| parent | 536bec1ce5b3d68a6773f31e3788c63e8905ce98 (diff) | |
Merge branch 'master' into core-updates-frozen
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/licenses.scm | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/guix/licenses.scm b/guix/licenses.scm index 3affe1e920..388023e619 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2020 Helio Machado <0x2b3bfa0+guix@googlemail.com> ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> +;;; Copyright © 2021 Noisytoot <noisytoot@disroot.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -234,11 +235,6 @@ 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" |