diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-27 00:12:15 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-27 00:12:15 +0100 |
| commit | 18af6870370226b4d502d7372844e7f2aded5887 (patch) | |
| tree | 749d93209bd0cb9710ccaae2207df670f37eaa36 /guix/licenses.scm | |
| parent | 0ab8ad46322bea331ed5f5592843ba35e7f38b37 (diff) | |
| parent | 3089b70d766bd9ec70e1464867130b7b864fbe17 (diff) | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/icu4c.scm
gnu/packages/man.scm
gnu/packages/python-xyz.scm
guix/scripts/environment.scm
guix/scripts/pack.scm
guix/scripts/package.scm
guix/scripts/pull.scm
guix/store.scm
Diffstat (limited to 'guix/licenses.scm')
| -rw-r--r-- | guix/licenses.scm | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/guix/licenses.scm b/guix/licenses.scm index 9153c3ccae..ab2ad3f169 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -75,10 +75,12 @@ ms-pl ncsa nmap + ogl-psi1.0 openldap2.8 openssl perl-license psfl public-domain qpl + qwt1.0 repoze ruby sgifreeb2.0 @@ -517,6 +519,11 @@ at URI, which may be a file:// URI pointing the package's tree." "https://svn.nmap.org/nmap/COPYING" "https://fedoraproject.org/wiki/Licensing/Nmap")) +(define ogl-psi1.0 + (license "Open Government Licence for Public Sector Information" + "https://www.nationalarchives.gov.uk/doc/open-government-licence/version/1/" + #f)) + (define openssl (license "OpenSSL" "http://directory.fsf.org/wiki/License:OpenSSL" @@ -549,6 +556,11 @@ at URI, which may be a file:// URI pointing the package's tree." "http://directory.fsf.org/wiki/License:QPLv1.0" "http://www.gnu.org/licenses/license-list.html#QPL")) +(define qwt1.0 + (license "QWT 1.0" + "http://qwt.sourceforge.net/qwtlicense.html" + "GNU Lesser General Public License with exceptions")) + (define repoze (license "Repoze" "http://repoze.org/LICENSE.txt" |