amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ghc-haddock-library: Update to 1.7.0.

Browse source 
The new source tarball does not have bundled dependencies, so it does
not need to be patched.

* gnu/packages/haskell-xyz.scm (ghc-haddock-library): Update to 1.7.0.
[source]: Remove 'patches', 'modules' and 'snippet'.
[arguments]: Update the 'relax-test-suite-dependencies' phase to allow
newer versions of 'hspec' and 'QuickCheck'; remove the
'add-examples-directory' phase.
* gnu/packages/patches/ghc-haddock-library-unbundle.patch: Delete file.
* gnu/local.mk: Remove it.
This commit is contained in:
Timothy Sample 2019-10-31 13:33:24 -04:00
parent 1e0db876d1
commit 10707d5720
No known key found for this signature in database
GPG key ID: 2AC6A5EC1C357C59
3 changed files with 6 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

23
gnu/packages/haskell-xyz.scm
View file

@ -4328,7 +4328,7 @@ documentation-generation tool for Haskell libraries.")
(define-public ghc-haddock-library
(package
(name "ghc-haddock-library")
(version "1.5.0.1")
(version "1.7.0")
(source
(origin
(method url-fetch)
@ -4338,29 +4338,18 @@ documentation-generation tool for Haskell libraries.")
".tar.gz"))
(sha256
(base32
"1cmbg8l5xrwpliclwy3l057raypjqy0hsg1h1743ahaj8gq10b7z"))
(patches (search-patches
"ghc-haddock-library-unbundle.patch"))
(modules '((guix build utils)))
(snippet '(begin
(delete-file-recursively "vendor")
#t))))
"04fhcjk0pvsaqvsgp2w06cv2qvshq1xs1bwc157q4lmkgr57khp7"))))
(build-system haskell-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
;; Since there is no revised Cabal file upstream, we have to
;; patch it manually.
(add-before 'configure 'relax-test-suite-dependencies
(lambda _
(substitute* "haddock-library.cabal"
(("base-compat\\s*\\^>= 0\\.9\\.3") "base-compat")
(("hspec\\s*\\^>= 2\\.4\\.4") "hspec"))))
;; The release tarball does not contain the "fixtures/examples"
;; directory, which is required for testing. In the upstream
;; repository, the directory exists and is populated. Here, we
;; create an empty directory to placate the tests.
(add-before 'check 'add-examples-directory
(lambda _
(mkdir "fixtures/examples")
(("hspec\\s*>= 2.4.4 && < 2.6") "hspec")
(("QuickCheck\\s*\\^>= 2.11") "QuickCheck"))
#t)))))
(native-inputs
`(("ghc-base-compat" ,ghc-base-compat)