Archived
1
0
Fork 0

gnu: Fix ambiguity between openssl package and license in tls module.

* gnu/packages/tls.scm: Prefix imported licenses.
This commit is contained in:
Andreas Enge 2015-07-05 18:54:48 +02:00
parent 90e1cdae0c
commit e9aa8d0ccb

View file

@ -20,8 +20,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages tls) (define-module (gnu packages tls)
#:use-module ((guix licenses) #:use-module ((guix licenses) #:prefix license:)
#:select (lgpl2.0+ lgpl2.1+ bsd-3 openssl))
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix utils) #:use-module (guix utils)
@ -63,7 +62,7 @@
for transmitting machine-neutral encodings of data objects in computer for transmitting machine-neutral encodings of data objects in computer
networking, allowing for formal validation of data according to some networking, allowing for formal validation of data according to some
specifications.") specifications.")
(license lgpl2.0+))) (license license:lgpl2.0+)))
(define-public p11-kit (define-public p11-kit
(package (package
@ -101,7 +100,7 @@ provides a standard configuration setup for installing PKCS#11 modules
in such a way that they are discoverable. It also solves problems with in such a way that they are discoverable. It also solves problems with
coordinating the use of PKCS#11 by different components or libraries coordinating the use of PKCS#11 by different components or libraries
living in the same process.") living in the same process.")
(license bsd-3))) (license license:bsd-3)))
(define-public gnutls (define-public gnutls
(package (package
@ -174,7 +173,7 @@ living in the same process.")
and DTLS protocols. It is provided in the form of a C library to support the and DTLS protocols. It is provided in the form of a C library to support the
protocols, as well as to parse and write X.5009, PKCS 12, OpenPGP and other protocols, as well as to parse and write X.5009, PKCS 12, OpenPGP and other
required structures.") required structures.")
(license lgpl2.1+))) (license license:lgpl2.1+)))
(define-public openssl (define-public openssl
(package (package
@ -228,7 +227,7 @@ required structures.")
(synopsis "SSL/TLS implementation") (synopsis "SSL/TLS implementation")
(description (description
"OpenSSL is an implementation of SSL/TLS") "OpenSSL is an implementation of SSL/TLS")
(license openssl) (license license:openssl)
(home-page "http://www.openssl.org/"))) (home-page "http://www.openssl.org/")))
(define-public perl-net-ssleay (define-public perl-net-ssleay