From 29a7c98a422bf3b9503ac8375db2ab28ef2dfe32 Mon Sep 17 00:00:00 2001 From: Ian Denhardt Date: Sat, 18 Oct 2014 22:03:42 -0400 Subject: gnu: Add 'version-prefix' and 'version-major+minor'; use them. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- gnu/packages/mpi.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/mpi.scm') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index e7919bc436..a268239d5e 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2014 Ludovic Courtès +;;; Copyright © 2014 Ian Denhardt ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +23,7 @@ (define-module (gnu packages mpi) #:use-module ((guix licenses) #:hide (expat)) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages gcc) @@ -32,8 +34,7 @@ (define-module (gnu packages mpi) #:use-module (gnu packages xml) #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages valgrind) - #:use-module (srfi srfi-1)) + #:use-module (gnu packages valgrind)) (define-public hwloc (package @@ -88,8 +89,7 @@ (define-public openmpi (origin (method url-fetch) (uri (string-append "http://www.open-mpi.org/software/ompi/v" - (string-join (take (string-split version #\.) 2) - ".") + (version-major+minor version) "/downloads/openmpi-" version ".tar.bz2")) (sha256 (base32 -- cgit v1.2.3