diff options
author | Robert Vollmert <rob@vllmrt.net> | 2019-07-04 09:57:31 +0200 |
---|---|---|
committer | Timothy Sample <samplet@ngyro.com> | 2019-08-07 22:05:29 -0400 |
commit | a1eb8be8ca1a0a4c952f264f8846b67a32db0ec8 (patch) | |
tree | 58ad4be9472ebf3c4d316a9d6d81151da69b64fc /gnu/packages/haskell-check.scm | |
parent | e07f7655587d05486990a74deb3e101a03b420db (diff) | |
download | guix-a1eb8be8ca1a0a4c952f264f8846b67a32db0ec8.tar guix-a1eb8be8ca1a0a4c952f264f8846b67a32db0ec8.tar.gz |
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>
Diffstat (limited to 'gnu/packages/haskell-check.scm')
-rw-r--r-- | gnu/packages/haskell-check.scm | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 3c10a5284e..2f0b842cae 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -54,7 +54,6 @@ (inputs `(("ghc-generic-deriving" ,ghc-generic-deriving) ("ghc-xml" ,ghc-xml) - ("ghc-stm" ,ghc-stm) ("ghc-tagged" ,ghc-tagged) ("ghc-tasty" ,ghc-tasty))) (home-page @@ -170,8 +169,7 @@ contains the correct result for the test.") "14riid753hjqr6lca1kgxpnvq0wykf0k3qc5jpag42hh8bszav22")))) (build-system haskell-build-system) (inputs - `(("ghc-stm" ,ghc-stm) - ("ghc-tagged" ,ghc-tagged) + `(("ghc-tagged" ,ghc-tagged) ("ghc-regex-tdfa" ,ghc-regex-tdfa) ("ghc-optparse-applicative" ,ghc-optparse-applicative) ("ghc-unbounded-delays" ,ghc-unbounded-delays) @@ -277,7 +275,6 @@ test-framework.") `(("ghc-optparse-applicative" ,ghc-optparse-applicative) ("ghc-reducers" ,ghc-reducers) ("ghc-split" ,ghc-split) - ("ghc-stm" ,ghc-stm) ("ghc-tagged" ,ghc-tagged) ("ghc-tasty" ,ghc-tasty))) (home-page "https://github.com/ocharles/tasty-rerun") @@ -340,7 +337,6 @@ development.") ("ghc-old-time" ,ghc-old-time) ("ghc-scientific" ,ghc-scientific) ("ghc-tagged" ,ghc-tagged) - ("ghc-text" ,ghc-text) ("ghc-transformers-compat" ,ghc-transformers-compat) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-uuid-types" ,ghc-uuid-types) @@ -827,7 +823,6 @@ implementations of cryptographic ciphers.") ("ghc-random" ,ghc-random) ("ghc-resourcet" ,ghc-resourcet) ("ghc-semigroups" ,ghc-semigroups) - ("ghc-stm" ,ghc-stm) ("ghc-th-lift" ,ghc-th-lift) ("ghc-transformers-base" ,ghc-transformers-base) ("ghc-wl-pprint-annotated" |