diff options
author | Marius Bakke <mbakke@fastmail.com> | 2018-08-07 00:50:25 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2018-08-07 00:50:25 +0200 |
commit | 6af7c2b178b4d9bf16aced8bbfc1518643425f13 (patch) | |
tree | c71a79116d94659576096362907160d5b82b367d /gnu/packages/libreoffice.scm | |
parent | 869250809bddcf8eab26ecdedabad6fc060751dd (diff) | |
parent | e921234d02c926b5a95498aed1280b6346dd0878 (diff) | |
download | guix-6af7c2b178b4d9bf16aced8bbfc1518643425f13.tar guix-6af7c2b178b4d9bf16aced8bbfc1518643425f13.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/libreoffice.scm')
-rw-r--r-- | gnu/packages/libreoffice.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 0fa04bdec7..25c99f1c73 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> -;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> @@ -896,7 +896,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (define-public libreoffice (package (name "libreoffice") - (version "6.0.5.1") + (version "6.0.6.2") (source (origin (method url-fetch) @@ -906,7 +906,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (version-prefix version 3) "/libreoffice-" version ".tar.xz")) (sha256 (base32 - "0vnmb231hyhxm7klaqd8vp3rmvix145bq8iqzv19jgl1yaqkxl21")) + "13kaikaz65xw9a3hxbh245cnydjpy58np22c7s0s65pnmcq68rpi")) (patches (search-patches "libreoffice-icu.patch" "libreoffice-glm.patch")))) (build-system gnu-build-system) |