From a1eb8be8ca1a0a4c952f264f8846b67a32db0ec8 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Thu, 4 Jul 2019 09:57:31 +0200 Subject: 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 --- gnu/packages/haskell-web.scm | 79 ++++++++------------------------------------ 1 file changed, 13 insertions(+), 66 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 6b7103562f..4bb790d93c 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -47,7 +47,6 @@ (base32 "1yv3dbyb0i1yqm796jgc4jj5kxkla1sxb3b2klw5ks182kdx8kjb")))) (build-system haskell-build-system) - (inputs `(("ghc-text" ,ghc-text))) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck))) (home-page "http://community.haskell.org/~ndm/tagsoup/") @@ -80,7 +79,6 @@ for screen-scraping.") (inputs `(("ghc-old-locale" ,ghc-old-locale) ("ghc-blaze-builder" ,ghc-blaze-builder) - ("ghc-text" ,ghc-text) ("ghc-data-default-class" ,ghc-data-default-class) ("ghc-hunit" ,ghc-hunit) ("ghc-quickcheck" ,ghc-quickcheck) @@ -136,8 +134,7 @@ requests, and the library is intended for implementing Ajax APIs.") ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) ("hspec-discover" ,hspec-discover))) (inputs - `(("ghc-case-insensitive" ,ghc-case-insensitive) - ("ghc-text" ,ghc-text))) + `(("ghc-case-insensitive" ,ghc-case-insensitive))) (home-page "https://github.com/aristidb/http-types") (synopsis "Generic HTTP types for Haskell") (description "This package provides generic HTTP types for Haskell (for @@ -169,7 +166,6 @@ both client and server code).") ("ghc-conduit-extra" ,ghc-conduit-extra) ("ghc-http-types" ,ghc-http-types) ("ghc-old-time" ,ghc-old-time) - ("ghc-parsec" ,ghc-parsec) ("ghc-puremd5" ,ghc-puremd5) ("ghc-network" ,ghc-network) ("ghc-network-uri" ,ghc-network-uri) @@ -215,7 +211,6 @@ responses coming back.") ("ghc-network-uri" ,ghc-network-uri) ("ghc-random" ,ghc-random) ("ghc-streaming-commons" ,ghc-streaming-commons) - ("ghc-text" ,ghc-text) ("ghc-zlib" ,ghc-zlib))) (native-inputs `(("ghc-hspec" ,ghc-hspec))) @@ -308,13 +303,12 @@ Date in Haskell.") ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-vector" ,ghc-vector) ("ghc-word8" ,ghc-word8) - ("ghc-psqueues" ,ghc-psqueues) - ("ghc-stm" ,ghc-stm))) - (native-inputs - `(("ghc-glob" ,ghc-glob) - ("ghc-hspec" ,ghc-hspec) - ("ghc-doctest" ,ghc-doctest) - ("hspec-discover" ,hspec-discover))) + ("ghc-psqueues" ,ghc-psqueues))) + (native-inputs + `(("ghc-glob" ,ghc-glob) + ("ghc-hspec" ,ghc-hspec) + ("ghc-doctest" ,ghc-doctest) + ("hspec-discover" ,hspec-discover))) (home-page "https://github.com/kazu-yamamoto/http2") (synopsis "HTTP/2 library including frames, priority queues and HPACK") (description "This package provides a HTTP/2.0 library including frames @@ -358,7 +352,6 @@ and HPACK. Currently HTTP/2 16 framing and HPACK 10 is supported.") ("ghc-connection" ,ghc-connection) ("ghc-warp-tls" ,ghc-warp-tls) ("ghc-blaze-builder" ,ghc-blaze-builder) - ("ghc-text" ,ghc-text) ("ghc-conduit" ,ghc-conduit) ("ghc-utf8-string" ,ghc-utf8-string) ("ghc-case-insensitive" ,ghc-case-insensitive) @@ -402,7 +395,6 @@ which allow you to avoid direct usage of conduits.") ("ghc-vault" ,ghc-vault) ("ghc-blaze-builder" ,ghc-blaze-builder) ("ghc-network" ,ghc-network) - ("ghc-text" ,ghc-text) ("ghc-http-types" ,ghc-http-types))) (native-inputs `(("hspec-discover" ,hspec-discover) @@ -482,7 +474,6 @@ communication between web applications and web servers.") ("ghc-void" ,ghc-void) ("ghc-wai" ,ghc-wai) ("ghc-http-types" ,ghc-http-types) - ("ghc-text" ,ghc-text) ("ghc-case-insensitive" ,ghc-case-insensitive) ("ghc-data-default-class" ,ghc-data-default-class) ("ghc-unix-compat" ,ghc-unix-compat) @@ -569,9 +560,7 @@ transfers.") ("ghc-http-types" ,ghc-http-types) ("ghc-iproute" ,ghc-iproute) ("ghc-network" ,ghc-network) - ("ghc-stm" ,ghc-stm) ("ghc-streaming-commons" ,ghc-streaming-commons) - ("ghc-text" ,ghc-text) ("ghc-unix-compat" ,ghc-unix-compat) ("ghc-vault" ,ghc-vault) ("ghc-wai" ,ghc-wai) @@ -670,8 +659,7 @@ a WAI handler, via the native Haskell TLS implementation.") ("ghc-css-text" ,ghc-css-text) ("ghc-network-uri" ,ghc-network-uri))) (native-inputs - `(("ghc-text" ,ghc-text) - ("ghc-attoparsec" ,ghc-attoparsec) + `(("ghc-attoparsec" ,ghc-attoparsec) ("ghc-hspec" ,ghc-hspec) ("ghc-hunit" ,ghc-hunit))) (home-page "https://github.com/yesodweb/haskell-xss-sanitize") @@ -697,8 +685,7 @@ attacks.") "0ynd9f4hn2sfwqzbsa0y7phmxq8za7jiblpjwx0ry8b372zhgxaz")))) (build-system haskell-build-system) (inputs - `(("ghc-text" ,ghc-text) - ("ghc-attoparsec" ,ghc-attoparsec) + `(("ghc-attoparsec" ,ghc-attoparsec) ("ghc-hspec" ,ghc-hspec) ("ghc-quickcheck" ,ghc-quickcheck))) (home-page "http://www.yesodweb.com/") @@ -720,8 +707,6 @@ Haskell.") (base32 "14ccl2842ya17zyj0bpc7vzklbyqvvydpbypn69h2fmhgji192x8")))) (build-system haskell-build-system) - (inputs - `(("ghc-text" ,ghc-text))) (home-page "https://github.com/yesodweb/wai") (synopsis "Basic MIME type handling types and functions") (description @@ -751,28 +736,6 @@ Haskell.") documents.") (license license:bsd-3))) -(define-public ghc-xhtml - (package - (name "ghc-xhtml") - (version "3000.2.2.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/xhtml/xhtml-" - version - ".tar.gz")) - (sha256 - (base32 - "0939kwpinq6l4n3nyvd1gzyl7f83gymw0wzqndlgy1yc7q0nkj2w")))) - (build-system haskell-build-system) - (home-page "https://github.com/haskell/xhtml") - (synopsis "XHTML combinator library") - (description - "This package provides combinators for producing XHTML 1.0, including the -Strict, Transitional and Frameset variants.") - (license license:bsd-3))) - (define-public ghc-blaze-html (package (name "ghc-blaze-html") @@ -789,7 +752,6 @@ Strict, Transitional and Frameset variants.") (build-system haskell-build-system) (inputs `(("ghc-blaze-builder" ,ghc-blaze-builder) - ("ghc-text" ,ghc-text) ("ghc-blaze-markup" ,ghc-blaze-markup))) (native-inputs `(("ghc-hunit" ,ghc-hunit) @@ -825,7 +787,6 @@ Strict, Transitional and Frameset variants.") ("ghc-hashable" ,ghc-hashable) ("ghc-scientific" ,ghc-scientific) ("ghc-tagged" ,ghc-tagged) - ("ghc-text" ,ghc-text) ("ghc-th-abstraction" ,ghc-th-abstraction) ("ghc-time-locale-compat" ,ghc-time-locale-compat) ("ghc-unordered-containers" ,ghc-unordered-containers) @@ -867,7 +828,6 @@ naming: in Greek mythology, Aeson was the father of Jason.)") ("ghc-base-compat" ,ghc-base-compat) ("ghc-scientific" ,ghc-scientific) ("ghc-vector" ,ghc-vector) - ("ghc-text" ,ghc-text) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-attoparsec" ,ghc-attoparsec) ("ghc-cmdargs" ,ghc-cmdargs))) @@ -897,12 +857,10 @@ essentially the opposite of pretty-printing.") (build-system haskell-build-system) (inputs `(("ghc-base-compat" ,ghc-base-compat) - ("ghc-text" ,ghc-text) ("ghc-attoparsec" ,ghc-attoparsec) ("ghc-scientific" ,ghc-scientific) ("ghc-vector" ,ghc-vector) ("ghc-aeson" ,ghc-aeson) - ("ghc-parsec" ,ghc-parsec) ("ghc-haskell-src-meta" ,ghc-haskell-src-meta))) (native-inputs `(("ghc-hspec" ,ghc-hspec) @@ -931,8 +889,7 @@ of a JSON value into a @code{Data.Aeson.Value}.") "1x4n4yyva22dhfr1pg5ki112qvvzb4hyd7bwpm189iq4gcp52q4z")))) (build-system haskell-build-system) (inputs - `(("ghc-parsec" ,ghc-parsec) - ("ghc-stringsearch" ,ghc-stringsearch))) + `(("ghc-stringsearch" ,ghc-stringsearch))) (home-page "http://www.github.com/silkapp/multipart") (synopsis @@ -956,8 +913,7 @@ of a JSON value into a @code{Data.Aeson.Value}.") "11miwb5vvnn17m92ykz1pzg9x6s8fbpz3mmsyqs2s4b3mn55haz8")))) (build-system haskell-build-system) (inputs - `(("ghc-text" ,ghc-text) - ("ghc-utf8-string" ,ghc-utf8-string) + `(("ghc-utf8-string" ,ghc-utf8-string) ("ghc-network-uri" ,ghc-network-uri))) (home-page "https://hackage.haskell.org/package/uri-encode") (synopsis "Unicode aware uri-encoding") @@ -978,7 +934,6 @@ of a JSON value into a @code{Data.Aeson.Value}.") (base32 "0vx3sivcsld76058925hym2j6hm3g71f0qjr7v59f1g2afgx82q8")))) (build-system haskell-build-system) - (inputs `(("ghc-text" ,ghc-text))) (native-inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-hspec" ,ghc-hspec) ("ghc-quickcheck" ,ghc-quickcheck))) @@ -1067,7 +1022,6 @@ avoid any issues with characters.") (build-system haskell-build-system) (inputs `(("ghc-wai" ,ghc-wai) ("ghc-extra" ,ghc-extra) - ("ghc-text" ,ghc-text) ("ghc-shakespeare" ,ghc-shakespeare) ("ghc-blaze-builder" ,ghc-blaze-builder) ("ghc-clientsession" ,ghc-clientsession) @@ -1081,7 +1035,6 @@ avoid any issues with characters.") ("ghc-cookie" ,ghc-cookie) ("ghc-http-types" ,ghc-http-types) ("ghc-case-insensitive" ,ghc-case-insensitive) - ("ghc-parsec" ,ghc-parsec) ("ghc-vector" ,ghc-vector) ("ghc-aeson" ,ghc-aeson) ("ghc-fast-logger" ,ghc-fast-logger) @@ -1147,8 +1100,7 @@ functions, widgets, etc.") (native-inputs `(("ghc-hspec" ,ghc-hspec) ("ghc-wai-extra" ,ghc-wai-extra) ("ghc-yesod-core" ,ghc-yesod-core) - ("ghc-persistent-sqlite" ,ghc-persistent-sqlite) - ("ghc-text" ,ghc-text))) + ("ghc-persistent-sqlite" ,ghc-persistent-sqlite))) (home-page "http://www.yesodweb.com/") (synopsis "Helpers for using Persistent from Yesod") (description "This Haskell package provides helpers for using Persistent @@ -1179,7 +1131,6 @@ from Yesod.") ("ghc-xss-sanitize" ,ghc-xss-sanitize) ("ghc-blaze-builder" ,ghc-blaze-builder) ("ghc-email-validate" ,ghc-email-validate) - ("ghc-text" ,ghc-text) ("ghc-wai" ,ghc-wai) ("ghc-blaze-html" ,ghc-blaze-html) ("ghc-blaze-markup" ,ghc-blaze-markup) @@ -1226,7 +1177,6 @@ providing richtext field using Nic editor. ") ("ghc-data-default-class" ,ghc-data-default-class) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-yaml" ,ghc-yaml) - ("ghc-text" ,ghc-text) ("ghc-monad-logger" ,ghc-monad-logger) ("ghc-fast-logger" ,ghc-fast-logger) ("ghc-conduit" ,ghc-conduit) @@ -1309,8 +1259,6 @@ ignored.") (build-system haskell-build-system) (inputs `(("ghc-hxt-charproperties" ,ghc-hxt-charproperties) - ("ghc-parsec" ,ghc-parsec) - ("ghc-text" ,ghc-text) ("ghc-hunit" ,ghc-hunit))) (home-page "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema") (synopsis "Regular expression library for W3C XML Schema regular expressions") @@ -1336,8 +1284,7 @@ derivations of regular expressions.") "1qq3ykgn355rx242xjcbqqksgvwr6k2fdj5phw4iv28qqxff6m8d")))) (build-system haskell-build-system) (inputs - `(("ghc-parsec" ,ghc-parsec) - ("ghc-hxt-charproperties" ,ghc-hxt-charproperties) + `(("ghc-hxt-charproperties" ,ghc-hxt-charproperties) ("ghc-hxt-unicode" ,ghc-hxt-unicode) ("ghc-hxt-regex-xmlschema" ,ghc-hxt-regex-xmlschema) ("ghc-network-uri" ,ghc-network-uri))) -- cgit v1.2.3