diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-02-27 08:52:23 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-02-27 08:52:23 -0500 |
| commit | 048ec1a8b092a87de08bfe410be65642522b63ed (patch) | |
| tree | 1279c4fa3fd09805dbfe06be3514879aa38d503e /gnu/packages/gps.scm | |
| parent | fe5f687284889eeff3c1b73edab0aa26e58c3bc5 (diff) | |
| parent | b35461748b20d0172744974b39e7d9d033400c51 (diff) | |
| download | guix-048ec1a8b092a87de08bfe410be65642522b63ed.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/gps.scm')
| -rw-r--r-- | gnu/packages/gps.scm | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index bede89e373..fd045b1f1a 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,7 +35,7 @@ (define-public gpsbabel (package (name "gpsbabel") - (version "1.5.0") + (version "1.5.2") (source (origin (method url-fetch) ;; XXX: Downloads from gpsbabel.org are hidden behind a POST, so @@ -44,16 +45,16 @@ version ".orig.tar.gz")) (sha256 (base32 - "1pd01kra9l5ihy1by87qia0mpbpcif7g5yg7r9z2bnw7711jm3yb")))) + "0xf7wmy2m29g2lm8lqc74yf8rf7sxfl3cfwbk7dpf0yf42pb0b6w")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-zlib=system") - #:phases (alist-cons-before - 'configure 'pre-configure - (lambda _ - (chdir "gpsbabel")) - ;; TODO: "make doc" requires Docbook & co. - %standard-phases) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'pre-configure + (lambda _ + (chdir "gpsbabel")))) + ;; TODO: "make doc" requires Docbook & co. ;; On i686, 'raymarine.test' fails because of a rounding error: ;; <http://hydra.gnu.org/build/133040>. As a workaround, disable tests @@ -62,7 +63,7 @@ (inputs `(("expat" ,expat) ("zlib" ,zlib) - ("qt4" ,qt-4))) + ("qt" ,qt))) (native-inputs `(("which" ,which) ("libxml2" ,libxml2))) ;'xmllint' needed for the KML tests |