diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-01-06 17:33:02 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-01-06 17:33:02 +0100 |
| commit | 4050e5d6cfe8f7af29f10b2f1b3c7febdc10946a (patch) | |
| tree | 574828c84e7bfb0b6850db4f30fc38bd8143584e /distro/packages/gnutls.scm | |
| parent | 79580eb698d07e4b21334ddfbcbcf620d27b5e41 (diff) | |
| parent | 233e76769ae3a438bff7117c68f2c88739a28db0 (diff) | |
| download | patches-4050e5d6cfe8f7af29f10b2f1b3c7febdc10946a.tar patches-4050e5d6cfe8f7af29f10b2f1b3c7febdc10946a.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
build-aux/download.scm
distro/packages/autotools.scm
distro/packages/base.scm
distro/packages/bootstrap.scm
distro/packages/lsh.scm
distro/packages/make-bootstrap.scm
distro/packages/ncurses.scm
distro/packages/perl.scm
tests/derivations.scm
tests/union.scm
Diffstat (limited to 'distro/packages/gnutls.scm')
| -rw-r--r-- | distro/packages/gnutls.scm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/distro/packages/gnutls.scm b/distro/packages/gnutls.scm index 65134bdded..3c5facd1f2 100644 --- a/distro/packages/gnutls.scm +++ b/distro/packages/gnutls.scm @@ -1,20 +1,20 @@ -;;; Guix --- Nix package management from Guile. -*- coding: utf-8 -*- -;;; Copyright (C) 2012 Ludovic Courtès <ludo@gnu.org> +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org> ;;; -;;; This file is part of Guix. +;;; This file is part of GNU Guix. ;;; -;;; Guix is free software; you can redistribute it and/or modify it +;;; GNU Guix is free software; you can redistribute it and/or modify it ;;; under the terms of the GNU General Public License as published by ;;; the Free Software Foundation; either version 3 of the License, or (at ;;; your option) any later version. ;;; -;;; Guix is distributed in the hope that it will be useful, but +;;; GNU Guix is distributed in the hope that it will be useful, but ;;; WITHOUT ANY WARRANTY; without even the implied warranty of ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;;; GNU General Public License for more details. ;;; ;;; You should have received a copy of the GNU General Public License -;;; along with Guix. If not, see <http://www.gnu.org/licenses/>. +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (distro packages gnutls) #:use-module (guix licenses) @@ -31,7 +31,7 @@ (define-public libtasn1 (package (name "libtasn1") - (version "3.0") + (version "3.2") (source (origin (method url-fetch) @@ -39,7 +39,7 @@ version ".tar.gz")) (sha256 (base32 - "00czfs2hlxb1nrnqicvwpm4ybpwg3hg5yj0a2nf13zrgkfdlkjzi")))) + "0gvgndypwicchf7m660zh7jdgmkfj9g9xavpcc08pyd0120y0bk7")))) (build-system gnu-build-system) (home-page "http://www.gnu.org/software/libtasn1/") (synopsis "GNU Libtasn1, an ASN.1 library") @@ -52,7 +52,7 @@ portable, and only require an ANSI C89 platform.") (define-public gnutls (package (name "gnutls") - (version "3.1.3") + (version "3.1.5") (source (origin (method url-fetch) @@ -62,7 +62,7 @@ portable, and only require an ANSI C89 platform.") ".tar.xz")) (sha256 (base32 - "0fff9frz0ycbnppfn0w4a2s9x27k21l4hh9zbax3v7a8cg33dcpw")))) + "1lz05l19s64s5hmhc9fh48ip6izy80bdiv0pwkfg9fwwvn25j29g")))) (build-system gnu-build-system) ;; Build of the Guile bindings is not parallel-safe. See |