diff options
| author | Marius Bakke <marius@gnu.org> | 2020-05-26 22:30:51 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-05-26 22:30:51 +0200 |
| commit | 9edb3f66fd807b096b48283debdcddccfea34bad (patch) | |
| tree | cfd86f44ad51df4341a0d48cf4978117e11d7f59 /gnu/packages/markup.scm | |
| parent | e5f95fd897ad32c93bb48ceae30021976a917979 (diff) | |
| parent | b6d18fbdf6ab4a8821a58aa16587676e835001f2 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/markup.scm')
| -rw-r--r-- | gnu/packages/markup.scm | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index c1fc71b0a2..3cd7fb559c 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -2,8 +2,9 @@ ;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org> ;;; Copyright © 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2017 ng0 <ng0@n0.is> +;;; Copyright © 2017 Nikita <nikita@n0.is> ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -205,7 +206,16 @@ implementation. (file-name (git-file-name name version)) (sha256 (base32 - "0r7jpqhgnssq444i8pwji2g36058vfzwkl70wbiwj13h4w5rfc8f")))) + "0r7jpqhgnssq444i8pwji2g36058vfzwkl70wbiwj13h4w5rfc8f")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Mimic upstream commit 68c3a91166347 to fix a test failure + ;; when using Python 3.8. Remove for versions > 0.29. + ;; See <https://github.com/commonmark/cmark/issues/313>. + (substitute* "test/normalize.py" + (("cgi") "html")) + #t)))) (build-system cmake-build-system) (arguments '(#:test-target "test")) |