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/gnome.scm | |
| parent | 38bf090e7c3952bb30707fe544987cccc85b8677 (diff) | |
| download | guix-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/gnome.scm')
| -rw-r--r-- | gnu/packages/gnome.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bbb3053284..d4972468a3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages bison) @@ -42,8 +44,7 @@ #:use-module (gnu packages xml) #:use-module (gnu packages gl) #:use-module (gnu packages compression) - #:use-module (gnu packages xorg) - #:use-module (srfi srfi-1)) + #:use-module (gnu packages xorg)) (define-public brasero (package @@ -706,8 +707,7 @@ featuring mature C, C++ and Python bindings.") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" - (string-join (take (string-split version #\.) 2) - ".") + (version-major+minor version) "/" name "-" version ".tar.bz2")) (sha256 (base32 "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i")) @@ -1077,7 +1077,7 @@ widgets built in the loading process.") (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" - (string-join (take (string-split version #\.) 2) ".") + (version-major+minor version) "/" name "-" version ".tar.bz2")) (sha256 (base32 |