gnu: discount: Update to 2.2.7.

* gnu/packages/markup.scm (discount): Update to 2.2.7.
This commit is contained in:
Tobias Geerinckx-Rice 2020-10-07 14:50:20 +02:00
parent f41b56a92e
commit 34316794e7
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79

View file

@ -3,7 +3,7 @@
;;; Copyright © 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Nikita <nikita@n0.is> ;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -113,7 +113,7 @@ (define-public markdown
(define-public discount (define-public discount
(package (package
(name "discount") (name "discount")
(version "2.2.4") (version "2.2.7")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -121,10 +121,11 @@ (define-public discount
"discount/discount-" version ".tar.bz2")) "discount/discount-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"199hwajpspqil0a4y3yxsmhdp2dm73gqkzfk4mrwzsmlq8y1xzbl")))) "024mxv0gpvilyfczarcgy5m7h4lv6qvhjfpf5i73qkxhszjjn9mi"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
#:parallel-build? #f ; libmarkdown won't be built in time
#:make-flags (list #:make-flags (list
(string-append "LFLAGS=-L. -Wl,-rpath=" (string-append "LFLAGS=-L. -Wl,-rpath="
(assoc-ref %outputs "out") "/lib")) (assoc-ref %outputs "out") "/lib"))
@ -139,10 +140,13 @@ (define-public discount
#t)) #t))
(replace 'configure (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(setenv "CC" ,(cc-for-target)) (let ((out (assoc-ref outputs "out")))
(invoke "./configure.sh" (setenv "CC" ,(cc-for-target))
(string-append "--prefix=" (assoc-ref outputs "out")) ;; The validate-runpath phase fails otherwise.
"--shared")))))) (setenv "LDFLAGS" (string-append "-Wl,-rpath=" out "/lib"))
(invoke "./configure.sh"
(string-append "--prefix=" out)
"--shared")))))))
(synopsis "Markdown processing library, written in C") (synopsis "Markdown processing library, written in C")
(description (description
"Discount is a markdown implementation, written in C. It provides a "Discount is a markdown implementation, written in C. It provides a