diff options
| author | Ian Denhardt <ian@zenhack.net> | 2014-10-18 22:03:42 -0400 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-10-20 15:32:54 +0200 |
| commit | 29a7c98a422bf3b9503ac8375db2ab28ef2dfe32 (patch) | |
| tree | 7fd9219e875e44fb6328b6f84994279e3504d34a /gnu/packages/gnutls.scm | |
| parent | 38bf090e7c3952bb30707fe544987cccc85b8677 (diff) | |
| download | guix-patches-29a7c98a422bf3b9503ac8375db2ab28ef2dfe32.tar guix-patches-29a7c98a422bf3b9503ac8375db2ab28ef2dfe32.tar.gz | |
gnu: Add 'version-prefix' and 'version-major+minor'; use them.
The procedure version-prefix truncates a version string to a certain
number of components. version-major+minor is a special case of this,
which extracts the "major.minor" part of the string. Previously this
was handled by an expression common to several packages.
* guix/utils.scm (version-prefix, version-major+minor): New procedures
* gnu/packages/backup.scm (duplicity): Use version-major+minor.
* gnu/packages/cmake.scm (cmake): Likewise.
* gnu/packages/gnome.scm (libbonobo, libbonoboui): Likewise.
* gnu/packages/gnutls.scm (gnutls): Likewise.
* gnu/packages/mail.scm (gmime): Likewise.
* gnu/packages/mpd.scm (mpd): Likewise.
* gnu/packages/mpi.scm (openmpi): Likewise.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/packages/gnutls.scm')
| -rw-r--r-- | gnu/packages/gnutls.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/gnutls.scm b/gnu/packages/gnutls.scm index 3e4fa631d9..166058841f 100644 --- a/gnu/packages/gnutls.scm +++ b/gnu/packages/gnutls.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,7 @@ #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module ((gnu packages compression) #:prefix guix:) #:use-module (gnu packages) @@ -29,8 +31,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages which) #:use-module (gnu packages texinfo) - #:use-module (gnu packages pkg-config) - #:use-module (srfi srfi-1)) + #:use-module (gnu packages pkg-config)) (define-public libtasn1 (package @@ -69,8 +70,7 @@ specifications.") ;; Note: Releases are no longer on ftp.gnu.org since the ;; schism (after version 3.1.5). (string-append "mirror://gnupg/gnutls/v" - (string-join (take (string-split version #\.) 2) - ".") + (version-major+minor version) "/gnutls-" version ".tar.xz")) (sha256 (base32 |