From 1b84d8ef34b03744185ca831c3a88a890dea2ac4 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 15 Nov 2019 12:50:30 -0500 Subject: gnu: ghc-haddock-api: Update to 2.22.0. * gnu/packages/patches/ghc-haddock-api-fix-haddock.patch: New file. * gnu/local.mk: Add it. * gnu/packages/haskell-xyz.scm (ghc-haddock-api): Update to 2.22.0. [source]: Use the new patch. [arguments]: Change the 'update-constraints' phase to allow newer versions of 'QuickCheck' and 'hspec'. --- gnu/packages/haskell-xyz.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages/haskell-xyz.scm') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 72e9ccc495..da4e7460b4 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -4740,7 +4740,7 @@ (define-public ghc-haddock (define-public ghc-haddock-api (package (name "ghc-haddock-api") - (version "2.19.0.1") + (version "2.22.0") (source (origin (method url-fetch) @@ -4748,9 +4748,10 @@ (define-public ghc-haddock-api "https://hackage.haskell.org/package/haddock-api/haddock-api-" version ".tar.gz")) + (patches (search-patches "ghc-haddock-api-fix-haddock.patch")) (sha256 (base32 - "0c6i7sljp7myz25d90gyw68a90i5jcrkajkxcciikp2hjirfaas3")))) + "149q4zlf4m7wcrr4af2n2flh0jxjsypshbc229vsj1m0kmz4z014")))) (build-system haskell-build-system) (arguments `(#:phases @@ -4758,10 +4759,10 @@ (define-public ghc-haddock-api (add-before 'configure 'update-constraints (lambda _ (substitute* "haddock-api.cabal" - (("Cabal \\^>= 2\\.0\\.0") - "Cabal ^>= 2.2.0") - (("hspec \\^>= 2\\.4\\.4") - "hspec >= 2.4.4 && < 2.6"))))))) + (("QuickCheck \\^>= 2\\.11") + "QuickCheck ^>= 2.13") + (("hspec >= 2\\.4\\.4 && < 2\\.6") + "hspec >= 2.4.4 && < 2.8"))))))) (inputs `(("ghc-paths" ,ghc-paths) ("ghc-haddock-library" ,ghc-haddock-library))) -- cgit v1.2.3