me
/
guix
Archived
1
0
Fork 0
Code

gnu: Remove ghc-pandoc@1. 

This old version of Pandoc no longer builds with GHC 8.4.3.

* gnu/packages/haskell-web.scm (ghc-aeson-for-pandoc-1): Remove variable.
* gnu/packages/haskell.scm (ghc-pandoc-types-for-pandoc-1,
ghc-texmath-for-pandoc-1, ghc-yaml-for-pandoc-1, ghc-hslua-for-pandoc-1,
ghc-skylighting-for-pandoc-1, ghc-doctemplates-for-pandoc-1, ghc-pandoc-1,
ghc-pandoc-citeproc-with-pandoc-1): Remove variables.
master
Timothy Sample 2018-09-04 23:52:09 -04:00 committed by Ricardo Wurmus
parent 662fd1a868
commit 8fe9ab9579
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
2 changed files with 0 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/haskell-web.scm
View File

@ -852,18 +852,6 @@ for Haskell, optimized for ease of use and high performance. (A note on
naming: in Greek mythology, Aeson was the father of Jason.)")
(license license:bsd-3)))
(define-public ghc-aeson-for-pandoc-1
(package (inherit ghc-aeson)
(version "1.1.2.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/aeson/aeson-"
version ".tar.gz"))
(sha256
(base32
"1zy5z8pzvh53qkjm0nm3f4rwqfqg3867ck8ncd6mrxpcyvxqqj1p"))))))
(define-public ghc-aeson-pretty
(package
(name "ghc-aeson-pretty")

212
gnu/packages/haskell.scm
View File

@ -5757,25 +5757,6 @@ pandoc to represent structured documents. It also provides functions for
building up, manipulating and serialising @code{Pandoc} structures.")
(license license:bsd-3)))
(define-public ghc-pandoc-types-for-pandoc-1
(package (inherit ghc-pandoc-types)
(version "1.17.0.5")
(source (origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"pandoc-types/pandoc-types-"
version ".tar.gz"))
(sha256
(base32
"1csipjdq00iiq77k2wlrg4i7afrzlh8nl585q785xzw7nn45b0n8"))))
(arguments
`(#:configure-flags (list "--allow-newer=QuickCheck"
"--allow-newer=HUnit")))
(inputs
`(("ghc-syb" ,ghc-syb)
("ghc-aeson" ,ghc-aeson-for-pandoc-1)
("ghc-string-qq" ,ghc-string-qq)))))
(define-public ghc-texmath
(package
(name "ghc-texmath")
@ -5808,26 +5789,6 @@ markup formats). The TeX reader supports basic LaTeX and AMS extensions, and
it can parse and apply LaTeX macros.")
(license license:gpl2+)))
(define-public ghc-texmath-for-pandoc-1
(package (inherit ghc-texmath)
(version "0.9.4.4")
(source (origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"texmath/texmath-" version ".tar.gz"))
(sha256
(base32
"129q33m56diiv35kdwfb07838wrg0mm88kxdqxfyl1zvf9nzkqkd"))))
(inputs
`(("ghc-network-uri" ,ghc-network-uri)
("ghc-pandoc-types" ,ghc-pandoc-types-for-pandoc-1)
("ghc-parsec" ,ghc-parsec)
("ghc-split" ,ghc-split)
("ghc-syb" ,ghc-syb)
("ghc-temporary" ,ghc-temporary)
("ghc-utf8-string" ,ghc-utf8-string)
("ghc-xml" ,ghc-xml)))))
(define-public ghc-regex-pcre-builtin
(package
(name "ghc-regex-pcre-builtin")
@ -6382,12 +6343,6 @@ back-ends.")
"This package provides a library to parse and render YAML documents.")
(license license:bsd-3)))
(define-public ghc-yaml-for-pandoc-1
(package (inherit ghc-yaml)
(inputs
`(("ghc-aeson" ,ghc-aeson-for-pandoc-1)
,@(alist-delete "ghc-aeson" (package-inputs ghc-yaml))))))
(define-public ghc-filemanip
(package
(name "ghc-filemanip")
@ -6489,27 +6444,6 @@ TIFF and GIF formats.")
described in @url{https://www.lua.org/}.")
(license license:expat)))
(define-public ghc-hslua-for-pandoc-1
(package (inherit ghc-hslua)
(version "0.4.1")
(source (origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"hslua/hslua-" version ".tar.gz"))
(sha256
(base32
"0gqp6qhp4v24kzv2j49kgk7bxqzw0w10x0zr0r2j9wkfavqb9wid"))))
(inputs
`(("lua" ,lua-5.1)
("ghc-text" ,ghc-text)))
(native-inputs
`(("ghc-quickcheck" ,ghc-quickcheck)
("ghc-quickcheck-instances" ,ghc-quickcheck-instances)
("ghc-hspec" ,ghc-hspec)
("ghc-hspec-contrib" ,ghc-hspec-contrib)
("ghc-hunit" ,ghc-hunit)
("hspec-discover" ,hspec-discover)))))
(define-public ghc-hslua-module-text
(package
(name "ghc-hslua-module-text")
@ -6763,56 +6697,6 @@ provided. Skylighting is intended to be the successor to highlighting-kate.")
`(("ghc-skylighting-core" ,ghc-skylighting-core)
,@(package-inputs ghc-skylighting-core)))))
(define-public ghc-skylighting-for-pandoc-1
(package (inherit ghc-skylighting)
(version "0.1.1.5")
(source (origin
(method git-fetch)
;; We take the sources from Github, because the tarball on
;; hackage does not include the XML files.
(uri (git-reference
(url "https://github.com/jgm/skylighting.git")
(commit version)))
(file-name (string-append "ghc-skylighting-" version "-checkout"))
(sha256
(base32
"0z3yv8v2fqqgv6lsf0ff3ld0h2vkg97b2jiry9wn2f1rizwdqmzl"))))
(arguments
`(#:configure-flags '("-fbootstrap")
#:phases
(modify-phases %standard-phases
;; After building the skylighting-extract tool we use it to generate
;; syntax source files from the included XML files. These are then
;; added to the skylighting.cabal file.
(add-after 'build 'extract-xml
(lambda _
(make-file-writable "skylighting.cabal")
(apply invoke "./dist/build/skylighting-extract/skylighting-extract"
(find-files "xml" "\\.xml$"))
#t))
;; Reconfigure without bootstrap flag
(add-after 'extract-xml 'configure-again
(lambda* (#:key outputs inputs tests? #:allow-other-keys)
((assoc-ref %standard-phases 'configure)
#:outputs outputs
#:inputs inputs
#:tests? tests?
#:configure-flags '("-f-bootstrap"))))
(add-after 'configure-again 'build-again
(assoc-ref %standard-phases 'build)))))
(inputs
`(("ghc-aeson" ,ghc-aeson-for-pandoc-1)
("ghc-ansi-terminal" ,ghc-ansi-terminal)
("ghc-blaze-html" ,ghc-blaze-html)
("ghc-case-insensitive" ,ghc-case-insensitive)
("ghc-diff" ,ghc-diff)
("ghc-hxt" ,ghc-hxt)
("ghc-pretty-show" ,ghc-pretty-show)
("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin)
("ghc-safe" ,ghc-safe)
("ghc-text" ,ghc-text)
("ghc-utf8-string" ,ghc-utf8-string)))))
(define-public ghc-doctemplates
(package
(name "ghc-doctemplates")
@ -6844,29 +6728,6 @@ provided. Skylighting is intended to be the successor to highlighting-kate.")
"This package provides a simple text templating system used by pandoc.")
(license license:bsd-3)))
(define-public ghc-doctemplates-for-pandoc-1
(package (inherit ghc-doctemplates)
(version "0.1.0.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"doctemplates/doctemplates-"
version ".tar.gz"))
(sha256
(base32
"0swal6rjya1293mwvl63jch5fx9ghpsil7qs4v7rpansa0izalmp"))))
(build-system haskell-build-system)
(inputs
`(("ghc-aeson" ,ghc-aeson-for-pandoc-1)
("ghc-blaze-markup" ,ghc-blaze-markup)
("ghc-blaze-html" ,ghc-blaze-html)
("ghc-text" ,ghc-text)
("ghc-vector" ,ghc-vector)
("ghc-parsec" ,ghc-parsec)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-scientific" ,ghc-scientific)))))
(define-public ghc-pandoc
(package
(name "ghc-pandoc")
@ -6956,66 +6817,6 @@ definition lists, tables, and other features. A compatibility mode is
provided for those who need a drop-in replacement for Markdown.pl.")
(license license:gpl2+)))
;; This is the last version of Pandoc 1.x, which is preferred for Rmarkdown.
(define-public ghc-pandoc-1
(package (inherit ghc-pandoc)
(version "1.19.2.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/pandoc/pandoc-"
version ".tar.gz"))
(sha256
(base32
"0mim429mpakrcnm50csxyqk3ljcx2l26r5grk6w9isnggwgqrq5v"))))
(arguments
`(#:configure-flags (list "--allow-newer=skylighting")))
(inputs
`(("ghc-aeson" ,ghc-aeson-for-pandoc-1)
("ghc-ansi-terminal" ,ghc-ansi-terminal)
("ghc-base64-bytestring" ,ghc-base64-bytestring)
("ghc-blaze-html" ,ghc-blaze-html)
("ghc-blaze-markup" ,ghc-blaze-markup)
("ghc-cmark" ,ghc-cmark)
("ghc-data-default" ,ghc-data-default)
("ghc-deepseq-generics" ,ghc-deepseq-generics)
("ghc-diff" ,ghc-diff)
("ghc-doctemplates" ,ghc-doctemplates-for-pandoc-1)
("ghc-executable-path" ,ghc-executable-path)
("ghc-extensible-exceptions" ,ghc-extensible-exceptions)
("ghc-filemanip" ,ghc-filemanip)
("ghc-haddock-library" ,ghc-haddock-library)
("ghc-hslua" ,ghc-hslua-for-pandoc-1)
("ghc-http" ,ghc-http)
("ghc-http-client" ,ghc-http-client)
("ghc-http-client-tls" ,ghc-http-client-tls)
("ghc-http-types" ,ghc-http-types)
("ghc-juicypixels" ,ghc-juicypixels)
("ghc-network" ,ghc-network)
("ghc-network-uri" ,ghc-network-uri)
("ghc-old-time" ,ghc-old-time)
("ghc-pandoc-types" ,ghc-pandoc-types-for-pandoc-1)
("ghc-parsec" ,ghc-parsec)
("ghc-random" ,ghc-random)
("ghc-scientific" ,ghc-scientific)
("ghc-sha" ,ghc-sha)
("ghc-skylighting" ,ghc-skylighting-for-pandoc-1)
("ghc-syb" ,ghc-syb)
("ghc-tagsoup" ,ghc-tagsoup)
("ghc-temporary" ,ghc-temporary)
("ghc-texmath" ,ghc-texmath-for-pandoc-1)
("ghc-text" ,ghc-text)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-vector" ,ghc-vector)
("ghc-xml" ,ghc-xml)
("ghc-yaml" ,ghc-yaml-for-pandoc-1)
("ghc-zip-archive" ,ghc-zip-archive)
("ghc-zlib" ,ghc-zlib)))
(native-inputs
`(("ghc-test-framework" ,ghc-test-framework)
("ghc-test-framework-hunit" ,ghc-test-framework-hunit)
("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2)))))
(define-public ghc-hs-bibutils
(package
(name "ghc-hs-bibutils")
@ -7251,19 +7052,6 @@ and also has a mode for converting bibliographic databases a YAML format
suitable for inclusion in pandoc YAML metadata.")
(license license:bsd-3)))
(define-public ghc-pandoc-citeproc-with-pandoc-1
(let ((for-pandoc-1
(package-input-rewriting
`((,ghc-aeson . ,ghc-aeson-for-pandoc-1)
(,ghc-yaml . ,ghc-yaml-for-pandoc-1)
(,ghc-texmath . ,ghc-texmath-for-pandoc-1)
(,ghc-pandoc-types . ,ghc-pandoc-types-for-pandoc-1)
(,ghc-hslua . ,ghc-hslua-for-pandoc-1)
(,ghc-skylighting . ,ghc-skylighting-for-pandoc-1)
(,ghc-doctemplates . ,ghc-doctemplates-for-pandoc-1)
(,ghc-pandoc . ,ghc-pandoc-1)))))
(for-pandoc-1 ghc-pandoc-citeproc)))
(define-public ghc-union-find
(package
(name "ghc-union-find")