diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2019-01-09 10:48:42 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2019-01-09 10:52:41 +0200 |
| commit | 0e289672503a4e1599ef826d49f2fa5575081942 (patch) | |
| tree | cdaec28207956090b7cebff805135754dcb22f06 /gnu/packages/libreoffice.scm | |
| parent | 0109b89c5834b5374f248dc3681702180013f41f (diff) | |
| parent | 6df4d8338d2bf94ab729e3b12e42ace0a06687ae (diff) | |
| download | gnu-guix-0e289672503a4e1599ef826d49f2fa5575081942.tar gnu-guix-0e289672503a4e1599ef826d49f2fa5575081942.tar.gz | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'gnu/packages/libreoffice.scm')
| -rw-r--r-- | gnu/packages/libreoffice.scm | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 451adb0eff..c88bf72c78 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, 2018 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2018, 2019 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> @@ -32,6 +32,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix download) + #:use-module (guix git-download) #:use-module ((guix licenses) #:select (gpl2+ lgpl2.1+ lgpl3+ mpl1.1 mpl2.0 non-copyleft x11-style bsd-3)) @@ -772,15 +773,17 @@ Zoner Draw version 4 and 5.") (define-public hunspell (package (name "hunspell") - (version "1.6.2") + (version "1.7.0") (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/hunspell/hunspell/archive/v" - version ".tar.gz")) - (sha256 (base32 - "1i7lsv2cm0713ia3j5wjkcrhpfp3lqpjpwp4d3v18n7ycaqcxn9w")) - (file-name (string-append name "-" version ".tar.gz")))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hunspell/hunspell") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0qxlkd012r45ppd21kldbq9k5ac5nmxz290z6m2kch9l56v768k1")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) |