diff options
author | Maxim Cournoyer <[email protected]> | 2021-10-01 17:10:49 -0400 |
---|---|---|
committer | Maxim Cournoyer <[email protected]> | 2021-10-01 17:10:49 -0400 |
commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/markup.scm | |
parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/markup.scm')
-rw-r--r-- | gnu/packages/markup.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index 695eed67b1..368976bfde 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 David Thompson <[email protected]> ;;; Copyright © 2016, 2019 Efraim Flashner <[email protected]> ;;; Copyright © 2017 Nikita <[email protected]> -;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <[email protected]> +;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <[email protected]> ;;; Copyright © 2020 Marius Bakke <[email protected]> ;;; Copyright © 2020 EuAndreh <[email protected]> ;;; Copyright © 2021 Noisytoot <[email protected]> @@ -284,7 +284,7 @@ and smu is that smu doesn't support reference style links.") (define-public md4c (package (name "md4c") - (version "0.4.7") + (version "0.4.8") (source (origin (method git-fetch) @@ -293,7 +293,7 @@ and smu is that smu doesn't support reference style links.") (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0m3202zzjvw4k7jw66z1qi3cbisxzvplq5alkygpifvhzm81gwwx")))) + (base32 "12pdh4rfjc3b0cblj5nz3jksr2376lx8ay0vw5dwa1s97q09pczq")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) (home-page "https://github.com/mity/md4c/") |