aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/haskell.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-09-26 01:11:32 +0200
committerMarius Bakke <mbakke@fastmail.com>2018-09-26 01:11:32 +0200
commit6a0427af6cc3d52c0efc09262e90c1858ae6f40e (patch)
treeafedf3a5728dfac46c20aed448326debccf96562 /gnu/packages/haskell.scm
parent985d542e028517b2888fa61831233a2b60dc7d48 (diff)
parent3b97a1779f3b65d582b8edc8c154b6414314b946 (diff)
downloadpatches-6a0427af6cc3d52c0efc09262e90c1858ae6f40e.tar
patches-6a0427af6cc3d52c0efc09262e90c1858ae6f40e.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/haskell.scm')
-rw-r--r--gnu/packages/haskell.scm9
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index eb629cf138..6b774c358a 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -6729,7 +6729,7 @@ documents.")
(define-public ghc-xml-conduit
(package
(name "ghc-xml-conduit")
- (version "1.7.1.2")
+ (version "1.8.0.1")
(source
(origin
(method url-fetch)
@@ -6737,11 +6737,12 @@ documents.")
"xml-conduit-" version ".tar.gz"))
(sha256
(base32
- "0n4k0rq9j5cc9kdvj9xbx8gmiqlyk5x6pw8yxzw5wfsw7qkych2s"))))
+ "177gmyigxql1pn3ncz0r8annwv5cbxnihbgrrg1dhm4gmc9jy2wq"))))
(build-system haskell-build-system)
(inputs
`(("ghc-conduit" ,ghc-conduit)
("ghc-conduit-extra" ,ghc-conduit-extra)
+ ("ghc-doctest" ,ghc-doctest)
("ghc-resourcet" ,ghc-resourcet)
("ghc-text" ,ghc-text)
("ghc-xml-types" ,ghc-xml-types)
@@ -6762,7 +6763,7 @@ the @code{conduit} package.")
(define-public ghc-pandoc-citeproc
(package
(name "ghc-pandoc-citeproc")
- (version "0.12.2.5")
+ (version "0.14.3.1")
(source
(origin
(method url-fetch)
@@ -6771,7 +6772,7 @@ the @code{conduit} package.")
version ".tar.gz"))
(sha256
(base32
- "1l58nbflcnlznc93qimkk7ghk2gv8kipf45zf88piqa2zys41yyx"))))
+ "0yj6rckwsc9vig40cm15ry0j3d01xpk04qma9n4byhal6v4b5h22"))))
(build-system haskell-build-system)
(arguments
`(#:phases