diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-04-08 23:08:56 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-04-08 23:08:56 +0200 |
| commit | db7441e4705ee22d9f8abbb764201144ced878cb (patch) | |
| tree | f6ddf1363ed2283ddd937434465bdf8e84c30c1b /guix | |
| parent | aa07299f1fcae53bfec353a0b05b944dab4f7bc6 (diff) | |
| parent | 2afb79392d39df05e5b285ea46dd59eafb0616d8 (diff) | |
| download | gnu-guix-db7441e4705ee22d9f8abbb764201144ced878cb.tar gnu-guix-db7441e4705ee22d9f8abbb764201144ced878cb.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/licenses.scm | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/guix/licenses.scm b/guix/licenses.scm index 952c3bfd1a..65d9c3da13 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2014, 2015, 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2014, 2015, 2017, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2012, 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> @@ -38,7 +38,6 @@ boost1.0 bsd-2 bsd-3 bsd-4 non-copyleft - bsd-style ;deprecated! cc0 cc-by2.0 cc-by3.0 cc-by4.0 cc-by-sa2.0 cc-by-sa3.0 cc-by-sa4.0 @@ -170,12 +169,6 @@ at URI, which may be a file:// URI pointing the package's tree." "Check the URI for details. " comment))) -(define bsd-style - ;; This alias is kept for backward-compatibility. Do not use it for new - ;; packages: it is ambiguous, as rightfully explained at - ;; <http://www.gnu.org/philosophy/words-to-avoid.html#BSD-style>. - non-copyleft) - (define cc0 (license "CC0" "http://directory.fsf.org/wiki/License:CC0" |