diff options
author | Ludovic Courtès <ludo@gnu.org> | 2012-12-15 15:28:50 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2012-12-15 15:28:50 +0100 |
commit | a784c3077e7cdae5d8492aa540b86b8d32c9a696 (patch) | |
tree | 9a09f9a1b2f032b09f2314cf12f7965877290eaf /distro/packages/gnutls.scm | |
parent | 7f131cf3681afe62c84db66e48430de9e54e7d7d (diff) | |
parent | 07ab4bf1fc590642307f18b4d1b8687dde3d664b (diff) | |
download | guix-patches-a784c3077e7cdae5d8492aa540b86b8d32c9a696.tar guix-patches-a784c3077e7cdae5d8492aa540b86b8d32c9a696.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
distro/packages/multiprecision.scm
Diffstat (limited to 'distro/packages/gnutls.scm')
-rw-r--r-- | distro/packages/gnutls.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/distro/packages/gnutls.scm b/distro/packages/gnutls.scm index 4498e8d117..65134bdded 100644 --- a/distro/packages/gnutls.scm +++ b/distro/packages/gnutls.scm @@ -17,11 +17,13 @@ ;;; along with Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (distro packages gnutls) + #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (distro packages base) - #:use-module (distro packages compression) + #:use-module ((distro packages compression) + #:renamer (symbol-prefix-proc 'guix:)) #:use-module (distro packages nettle) #:use-module (distro packages guile) #:use-module (distro packages perl)) @@ -45,7 +47,7 @@ "Libtasn1 is the ASN.1 library used by GnuTLS, GNU Shishi and some other packages. The goal of this implementation is to be highly portable, and only require an ANSI C89 platform.") - (license "LGPLv2+"))) + (license lgpl2.0+))) (define-public gnutls (package @@ -71,7 +73,7 @@ portable, and only require an ANSI C89 platform.") (inputs `(("guile" ,guile-2.0) ;; ("lzo" ,lzo) - ("zlib" ,zlib) + ("zlib" ,guix:zlib) ("perl" ,perl))) (propagated-inputs `(("libtasn1" ,libtasn1) @@ -91,4 +93,4 @@ Quoting from the TLS protocol specification: Internet. The protocol allows client/server applications to communicate in a way that is designed to prevent eavesdropping, tampering, or message forgery.\"") - (license "LGPLv2.1+"))) + (license lgpl2.1+))) |