Commit graph

20 commits

Author SHA1 Message Date
Robert Vollmert
a1eb8be8ca
gnu: Remove ghc-parsec, ghc-stm, ghc-text, ghc-xhtml.
These are ghc-8.4-bundled packages, removing to avoid build
conflicts.

* gnu/packages/haskell.scm (ghc-parsec, ghc-stm, ghc-text): Remove.
* gnu/packages/haskell-web.scm (ghc-xhtml): Remove.
* gnu/packages/agda.scm (agda)[inputs]: Remove ghc-stm and ghc-text.
* gnu/packages/bioinformatics.scm (ngless)[inputs]: Remove ghc-parsec and
ghc-text.
* gnu/packages/haskell-apps.scm (darcs)[inputs]: Remove ghc-parsec.
(git-annex)[inputs]: Remove ghc-stm and ghc-text.
(ghc-sdl2)[inputs]: Remove ghc-text.
(ghc-sdl2-image)[inputs]: Remove ghc-text.
* gnu/packages/haskell-check.scm (ghc-tasty-ant-xml)[inputs]: Remove ghc-stm.
(ghc-tasty)[inputs]: Remove ghc-stm.
(ghc-tasty-rerun)[inputs]: Same.
(ghc-quickcheck-instances)[inputs]: Remove ghc-text.
(ghc-hedgehog)[inputs]: Remove ghc-stm.
* gnu/packages/haskell-crypto.scm (ghc-asn1-encoding)[inputs]: Remove
ghc-text.
* gnu/packages/haskell-web.scm (ghc-tagsoup)[inputs]: Remove ghc-text.
(ghc-cookie)[inputs]: Same.
(ghc-http-types)[inputs]: Same.
(ghc-http)[inputs]: Remove ghc-parsec.
(ghc-http-client)[inputs]: Remove ghc-text.
(ghc-http2)[inputs]: Remove ghc-stm.
(ghc-http-conduit)[native-inputs]: Remove ghc-text.
(ghc-wai)[inputs]: Same.
(ghc-wai-extra)[inputs]: Same.
(ghc-warp)[inputs]: Remove ghc-stm and ghc-text.
(ghc-xss-sanitize)[native-inputs]: Remove ghc-text.
(ghc-css-text)[inputs]: Same.
(ghc-mime-types)[inputs]: Same.
(ghc-blaze-html)[inputs]: Same.
(ghc-aeson)[inputs]: Same.
(ghc-aeson-pretty)[inputs]: Same.
(ghc-aeson-qq)[inputs]: Remove ghc-text and ghc-parsec.
(ghc-multipart)[inputs]: Remove ghc-parsec.
(ghc-uri-encode)[inputs]: Remove ghc-text.
(ghc-path-pieces)[inputs]: Same.
(ghc-yesod-core)[inputs]: Remove ghc-text and ghc-parsec.
(ghc-yesod-persistent)[inputs]: Remove ghc-text.
(ghc-yesod-form)[inputs]: Same.
(ghc-yesod)[inputs]: Same.
(ghc-hxt-regex-xmlschema)[inputs]: Remove ghc-parsec and ghc-text.
(ghc-hxt)[inputs]: Remove ghc-parsec.
* gnu/packages/haskell.scm (ghc-convertible)[inputs]: Remove ghc-text.
(ghc-double-conversion)[inputs]: Same.
(ghc-tree-diff)[inputs]: Remove ghc-parsec and ghc-text.
[native-inputs]: Remove ghc-parsec.
(ghc-cgi)[inputs]: Remove ghc-parsec.
(hlint)[inputs]: Remove ghc-text.
(ghc-openglraw)[inputs]: Remove ghc-text.
(ghc-opengl)[inputs]: Same.
(ghc-streaming-commons)[inputs]: Remove ghc-stm and ghc-text.
(ghc-hackage-security)[inputs]: Remove ghc-parsec.
(cabal-install)[inputs]: Remove ghc-stm.
(ghc-parsec-numbers)[inputs]: Remove ghc-parsec.
(ghc-safesemaphore)[inputs]: Remove ghc-stm.
(ghc-text-binary)[inputs]: Remove ghc-text.
(ghc-hashable)[inputs]: Remove ghc-text.
(ghc-transformers-base)[inputs]: Remove ghc-stm.
(ghc-indents)[inputs]: Remove ghc-parsec.
(ghc-regex-tdfa-rc)[inputs]: Same.
(ghc-regex-tdfa-text)[inputs]: Same.
(ghc-regex)[inputs]: Remove ghc-text.
(ghc-parsers)[inputs]: Remove ghc-parsec and ghc-text.
(ghc-attoparsec)[inputs]: Remove ghc-text.
(ghc-attoparsec-bootstrap)[inputs]: Same.
(ghc-zip-archive)[inputs]: Same.
(ghc-polyparse)[inputs]: Same.
(ghc-reducers)[inputs]: Same.
(ghc-xml)[inputs]: Same.
(ghc-feed)[inputs]: Same.
(ghc-exceptions)[inputs]: Remove ghc-stm.
(ghc-case-insensitive)[inputs]: Remove ghc-text.
(ghc-megaparsec)[inputs]: Same.
(ghc-network-uri)[inputs]: Remove ghc-parsec.
(ghc-monad-control)[inputs]: Remove ghc-stm.
(ghc-blaze-builder)[inputs]: Remove ghc-text.
(ghc-blaze-markup)[inputs]: Same.
(ghc-async)[inputs]: Remove ghc-stm.
(ghc-invariant)[inputs]: Same.
(ghc-statevar)[inputs]: Same.
(ghc-lens)[inputs]: Remove ghc-text.
(ghc-cheapskate)[inputs]: Same.
(ghc-semigroups)[inputs]: Same.
(ghc-semigroups-bootstrap)[inputs]: Same.
(ghc-fast-logger)[inputs]: Same.
(ghc-scientific)[inputs]: Same.
(ghc-scientific-bootstrap)[inputs]: Same.
(ghc-texmath)[inputs]: Remove ghc-parsec.
(ghc-highlighting-kate)[inputs]: Same.
(ghc-cmark)[inputs]: Remove ghc-text.
(ghc-cmark-gfm)[inputs]: Same.
(ghc-th-lift-instances)[inputs]: Same.
(ghc-yaml)[inputs]: Same.
(ghc-hslua)[inputs]: Same.
(ghc-hslua-module-text)[inputs]: Same.
(ghc-skylighting-core)[inputs]: Same.
(ghc-doctemplates)[inputs]: Remove ghc-text and ghc-parsec.
(ghc-pandoc)[inputs]: Same.
(ghc-typed-process)[inputs]: Remove ghc-stm.
(ghc-conduit-extra)[inputs]: Remove ghc-stm and ghc-text.
(ghc-xml-types)[inputs]: Remove ghc-text.
(ghc-xml-conduit)[inputs]: Same.
(ghc-pandoc-citeproc)[inputs]: Remove ghc-text and ghc-parsec.
(ghc-regex-tdfa)[inputs]: Remove ghc-parsec.
(ghc-wl-pprint-text)[inputs]: Remove ghc-text.
(ghc-graphviz)[inputs]: Same.
(ghc-system-filepath-bootstrap)[inputs]: Same.
(ghc-system-fileio-bootstrap)[inputs]: Same.
(ghc-shelly)[inputs]: Same.
(ghc-chell)[inputs]: Same.
(ghc-system-filepath)[inputs]: Same.
(ghc-system-fileio)[inputs]: Same.
(ghc-fsnotify)[inputs]: Same.
(ghc-json)[inputs]: Remove ghc-text and ghc-parsec.
(ghc-esqueleto)[inputs]: Remove ghc-text.
(shellcheck)[inputs]: Remove ghc-parsec.
(ghc-errors)[inputs]: Remove ghc-text.
(ghc-chunked-data)[inputs]: Same.
(ghc-uuid-types)[inputs]: Same.
(ghc-uuid)[inputs]: Same.
(ghc-rebase)[inputs]: Remove ghc-stm and ghc-text.
(ghc-foldl)[inputs]: Remove ghc-text.
(ghc-mono-traversable)[inputs]: Same.
(ghc-conduit-combinators)[inputs]: Same.
(ghc-aws)[inputs]: Same.
(ghc-stm-chans)[inputs]: Remove ghc-stm.
(ghc-monad-logger)[inputs]: Remove ghc-text and ghc-stm.
(ghc-shakespeare)[inputs]: Remove ghc-parsec and ghc-text.
(ghc-resource-pool)[inputs]: Remove ghc-stm.
(ghc-attoparsec-iso8601)[inputs]: Remove ghc-text.
(ghc-http-api-data)[inputs]: Same.
(ghc-persistent)[inputs]: Same.
(ghc-aeson-compat)[inputs]: Same.
(ghc-persistent-template)[inputs]: Same.
(ghc-unliftio)[inputs]: Remove ghc-stm.
(ghc-persistent-sqlite)[native-inputs]: Remove ghc-text.
(ghc-bytes)[inputs]: Same.
(ghc-missingh)[inputs]: Remove ghc-parsec.
(ghc-rio)[inputs]: Remove ghc-text.
(ghc-cairo)[inputs]: Same.
(ghc-atomic-write)[inputs]: Remove ghc-text.
[native-inputs]: Same.
(ghc-stm-conduit)[inputs]: Remove ghc-stm.
(ghc-conduit-algorithms)[inputs]: Same.
(ghc-interpolate)[native-inputs]: Remove ghc-text.
(ghc-hpack)[inputs]: Same.
(ghc-inline-c)[inputs]: Remove ghc-parsec.
(ghc-configurator)[inputs]: Remove ghc-text.
(ghc-c2hs)[native-inputs]: Same.
(ghc-libmpd)[inputs]: Same.
(ghc-concurrent-output)[inputs]: Remove ghc-stm.
* gnu/packages/idris.scm (idris)[inputs]: Remove ghc-text.
* gnu/packages/wm.scm (xmobar)[inputs]: Remove ghc-parsec and ghc-stm.

Signed-off-by: Ricardo Wurmus <rekado@elephly.net>
2019-08-07 22:05:29 -04:00
Eric Bavier
89647ff1d4
gnu: idris: Run tests.
* gnu/packages/patches/idris-test-no-node.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/idris.scm (idris)[origin]: Use it.
[native-inputs]: New field.
[arguments]: Remove "#:tests? #f".  Add custom 'check' phase after 'install'.
2019-04-11 19:34:01 -05:00
Eric Bavier
e16bc71015
gnu: idris: Enable FFI and GMP support.
* gnu/packages/idris.scm (idris)[inputs]: Add ghc-libffi.
[arguments]: Add "-fFFI" and "-fGMP" to #:configure-flags.
2019-04-11 19:34:01 -05:00
Eric Bavier
a4df9ba4ec
gnu: idris: Upgrade to 1.3.1.
* gnu/packages/idris.scm (idris): Upgrade to 1.3.1.
[arguments]: Remove 'update-constraints' phase.
2019-04-11 19:34:00 -05:00
Timothy Sample
53812aa77f
gnu: idris: Update to 1.3.0.
* gnu/packages/idris.scm (idris): Update to 1.3.0.
[inputs]: Remove ghc-aeson-1.1.2.0, ghc-cheapskate-0.1.0.5, and
ghc-trifecta-1.6.2.1; add ghc-aeson, ghc-cheapskate, and ghc-megaparsec.
[arguments]: Add a phase that patches the Cabal file to allow newer
versions of aeson.
(ghc-aeson-1.1.2.0, ghc-cheapskate-0.1.0.5, ghc-trifecta-1.6.2.1): Remove.
2018-10-01 12:12:20 +02:00
Timothy Sample
f54f04756f
gnu: ghc-mtl: Remove built-in Haskell package.
* gnu/packages/agda.scm (agda)[inputs]: Remove ghc-mtl.
* gnu/packages/games.scm (raincat)[inputs]: Remove ghc-mtl.
* gnu/packages/haskell-check.scm (ghc-tasty-ant-xml, ghc-tasty-golden,
ghc-tasty, ghc-tasty-kat, ghc-tasty-rerun,
ghc-crypto-cipher-tests)[inputs]: Remove ghc-mtl.
* gnu/packages/haskell-crypto.scm (ghc-asn1-encoding, ghc-pem, ghc-x509,
ghc-x509-store, ghc-x509-validation, ghc-x509-system)[inputs]: Remove
ghc-mtl.
* gnu/packages/haskell-web.scm (ghc-http, ghc-http-conduit,
ghc-yesod-core)[inputs]: Remove ghc-mtl.
* gnu/packages/haskell.scm (ghc-convertible, ghc-libxml, ghc-cgi,
ghc-happy, ghc-haskell-src-exts, ghc-resourcet, cabal-install,
ghc-indents, ghc-regex-base, ghc-regex-tdfa-rc, ghc-trifecta,
ghc-zip-archive, ghc-logict, ghc-exceptions, ghc-smallcheck, ghc-syb,
ghc-fgl, ghc-chasingbottoms, ghc-parsec, ghc-megaparsec, ghc-edisonapi,
ghc-edisoncore, ghc-mmorph, ghc-ifelse, ghc-kan-extensions, ghc-lens,
ghc-cheapskate, ghc-free, ghc-adjunctions, ghc-equivalence, ghc-texmath,
ghc-texmath-for-pandoc-1, ghc-highlighting-kate, ghc-th-reify-many,
ghc-th-orphans, ghc-geniplate-mirror, ghc-conduit, ghc-filemanip,
ghc-juicypixels, ghc-hslua, ghc-hourglass, ghc-skylighting,
ghc-skylighting-for-pandoc-1, ghc-pandoc, ghc-pandoc-1,
ghc-pandoc-citeproc, ghc-regex-tdfa, ghc-stmonadtrans, ghc-constraints,
ghc-lifted-async, ghc-shelly, ghc-hslogger, ghc-json, shellcheck,
ghc-vector-algorithms, ghc-monad-par-extras, ghc-monad-par,
ghc-monadrandom, ghc-either, ghc-rebase, ghc-aws, ghc-monad-logger,
ghc-persistent, ghc-bytes, ghc-missingh, ghc-operational,
ghc-chart)[inputs]: Remove ghc-mtl.
(ghc-conduit-combinators)[native-inputs]: Remove ghc-mtl.
(ghc-mtl): Remove variable.
* gnu/packages/idris.scm (idris)[inputs]: Remove ghc-mtl.
* gnu/packages/tls.scm (ghc-tls)[inputs]: Remove ghc-mtl.
* gnu/packages/version-control.scm (darcs, git-annex)[inputs]: Remove
ghc-mtl.
* gnu/packages/wm.scm (xmonad, ghc-xmonad-contrib)[inputs]: Remove
ghc-mtl.
* gnu/packages/xml.scm (ghc-hxt)[inputs]: Remove ghc-mtl.
2018-10-01 12:12:08 +02:00
Alex ter Weele
d661ed521e
gnu: idris: Provide the right versions of dependencies.
Previously it would fail to build.  See <https://bugs.gnu.org/30741>.

* gnu/packages/idris.scm (idris)[inputs]: alphebetize
  ghc-vector-binary-instances and ghc-async. Use ghc-aeson-1.1.2.0,
  ghc-cheapskate-0.1.0.5, and ghc-trifecta-1.6.2.1. Remove ghc-aeson,
  ghc-cheapskate, ghc-parsers, ghc-tasty, ghc-tasty-golden, ghc-tasty-rerun,
  ghc-trifecta, and ghc-zlib.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2018-03-15 23:46:16 +01:00
Alex ter Weele
866b19086e
gnu: Add ghc-cheapskate-0.1.0.5.
* gnu/packages/idris.scm (ghc-cheapskate-0.1.0.5): New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2018-03-15 23:46:16 +01:00
Alex ter Weele
78dc985bee
gnu: Add ghc-trifecta-1.6.2.1.
* gnu/packages/idris.scm (ghc-trifecta-1.6.2.1): New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2018-03-15 23:46:15 +01:00
Alex ter Weele
9c7e17fd61
gnu: Add ghc-aeson-1.1.2.0.
* gnu/packages/idris.scm (ghc-aeson-1.1.2.0): New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2018-03-15 23:46:15 +01:00
Ricardo Wurmus
44b7374a22
gnu: Move web packages from haskell to haskell-web.
* gnu/packages/haskell.scm (ghc-tagsoup, ghc-cookie, ghc-http-types, ghc-http,
ghc-http-client, ghc-http-client-tls, ghc-http-date, ghc-http2,
ghc-http-conduit, ghc-wai, ghc-wai-logger, ghc-wai-extra, ghc-wai-conduit,
ghc-warp, ghc-warp-tls, ghc-xss-sanitize, ghc-css-text, ghc-mime-types,
ghc-html, ghc-xhtml, ghc-blaze-html, ghc-aeson, ghc-aeson-pretty,
ghc-aeson-qq, ghc-multipart): Move variables to ...
* gnu/packages/haskell-web.scm: ... this new file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* gnu/packages/haskell.scm,
gnu/packages/idris.scm,
gnu/packages/version-control.scm,
gnu/packages/wm.scm: Include haskell-web module.
2017-11-13 18:12:37 +01:00
Ricardo Wurmus
a06b9b5007
gnu: Move testing packages from haskell to haskell-check.
* gnu/packages/haskell.scm (ghc-clock-bootstrap, ghc-tasty-ant-xml,
ghc-tasty-smallcheck, ghc-tasty-quickcheck, ghc-tasty-golden, ghc-tasty,
ghc-tasty-hunit, ghc-tasty-kat, ghc-tasty-th, ghc-tasty-rerun,
ghc-quickcheck-instances, ghc-quickcheck-unicode, ghc-quickcheck-io,
ghc-quickcheck, ghc-test-framework, ghc-test-framework-hunit,
ghc-test-framework-quickcheck2, ghc-test-framework-th, ghc-hunit,
hspec-discover, ghc-hspec-core, ghc-hspec-meta, ghc-hspec, ghc-hspec-contrib,
ghc-hspec-expectations): Move variables to ...
* gnu/packages/haskell-check.scm: ... this new file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* gnu/packages/haskell.scm,
gnu/packages/idris.scm,
gnu/packages/version-control.scm,
gnu/packages/wm.scm: Include haskell-check module.
2017-11-13 18:12:27 +01:00
Peter Mikkelsen
178670c9eb
gnu: idris: Fix idris-default-arguments.
* gnu/packages/idris.scm (idris-default-arguments): Don't set IDRIS_LIBRARY_PATH before
building and change --install to --build.

Signed-off-by: Marius Bakke <mbakke@fastmail.com>
2017-04-15 19:46:40 +02:00
Peter Mikkelsen
b74f224744
gnu: idris: Update to 1.0.
* gnu/packages/idris.scm (idris): Update to 1.0.

Signed-off-by: Marius Bakke <mbakke@fastmail.com>
2017-04-15 19:46:40 +02:00
Peter Mikkelsen
c53af0016e
gnu: idris: Update to 0.99.1.
* gnu/packages/idris.scm (idris): Update to 0.99.1.
[inputs]: Add ghc-code-page.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2017-03-23 12:59:03 +01:00
David Craven
3254e1aba9
gnu: Add idris-lens.
* gnu/packages/idris.scm (idris-lens): New variable.
2017-01-04 12:11:14 +01:00
David Craven
5a16d828b3
gnu: Add idris-bifunctors.
* gnu/packages/idris.scm (idris-bifunctors): New variable.
2017-01-04 12:11:14 +01:00
David Craven
4e17fff386
gnu: Add idris-wl-pprint.
* gnu/packages/idris.scm (idris-wl-pprint): New variable.
2017-01-04 12:11:14 +01:00
David Craven
ea3b38f1e1
gnu: Add idris-lightyear.
* gnu/packages/idris.scm (idris-lightyear, idris-default-arguments):
  New variables.
2017-01-04 12:11:14 +01:00
David Craven
ae482ce12d
gnu: idris: Move to (gnu packages idris).
* gnu/packages/haskell.scm: Move 'idris' to...
* gnu/packages/idris.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add idris.scm.
2017-01-04 11:51:36 +01:00