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 --- guix/utils.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'guix/utils.scm') diff --git a/guix/utils.scm b/guix/utils.scm index 6392914845..9b802b6fb3 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès ;;; Copyright © 2013 Mark H Weaver ;;; Copyright © 2014 Eric Bavier +;;; Copyright © 2014 Ian Denhardt ;;; ;;; This file is part of GNU Guix. ;;; @@ -65,6 +66,8 @@ (define-module (guix utils) %current-target-system version-compare version>? + version-prefix + version-major+minor guile-version>? package-name->name+version string-tokenize* @@ -518,6 +521,17 @@ (define version-compare ((negative? result) '<) (else '=)))))) +(define (version-prefix version-string num-parts) + "Truncate version-string to the first num-parts components of the version. +For example, (version-prefix \"2.1.47.4.23\" 3) returns \"2.1.47\"" + (string-join (take (string-split version-string #\.) num-parts) ".")) + + +(define (version-major+minor version-string) + "Return \".\", where major and minor are the major and +minor version numbers from version-string." + (version-prefix version-string 2)) + (define (version>? a b) "Return #t when A denotes a newer version than B." (eq? '> (version-compare a b))) -- cgit v1.2.3