* [bug#36493] update GHC-included haskell dependencies @ 2019-07-04 7:55 Robert Vollmert 2019-07-04 7:57 ` [bug#36493] [PATCH 1/2] import: hackage: Update list of ghc-included packages Robert Vollmert 0 siblings, 1 reply; 10+ messages in thread From: Robert Vollmert @ 2019-07-04 7:55 UTC (permalink / raw) To: 36493 Two patches to fix the current broken state regarding Haskell-included packages. Compare commit 1cc12357a65e4479c2f4735e915941382ef82d94. ^ permalink raw reply [flat|nested] 10+ messages in thread
* [bug#36493] [PATCH 1/2] import: hackage: Update list of ghc-included packages. 2019-07-04 7:55 [bug#36493] update GHC-included haskell dependencies Robert Vollmert @ 2019-07-04 7:57 ` Robert Vollmert 2019-07-04 7:57 ` [bug#36493] [PATCH 2/2] gnu: Remove ghc-parsec, ghc-stm, ghc-text, ghc-xhtml Robert Vollmert 0 siblings, 1 reply; 10+ messages in thread From: Robert Vollmert @ 2019-07-04 7:57 UTC (permalink / raw) To: 36493; +Cc: Robert Vollmert It turns out the list in the release notes is incomplete. This updates the list from /gnu/store/<hash>-ghc-8.4.3/lib/ghc-8.4.3. * guix/import/hackage.scm (ghc-standard-libraries): Update list. --- guix/import/hackage.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index 0a8e619b6f..b22b53f00e 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016 ng0 <ng0@n0.is> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -52,7 +53,7 @@ (define ghc-standard-libraries ;; List of libraries distributed with ghc (8.4.3). - ;; https://downloads.haskell.org/~ghc/8.4.3/docs/html/users_guide/8.4.3-notes.html + ;; Contents of ...-ghc-8.4.3/lib/ghc-8.4.3. '("ghc" "cabal" ;; in the output of `ghc-pkg list` Cabal is uppercased, but ;; hackage-name->package-name takes this into account. @@ -65,7 +66,9 @@ "deepseq" "directory" "filepath" + "ghc" "ghc-boot" + "ghc-boot-th" "ghc-compact" "ghc-prim" "ghci" @@ -74,8 +77,11 @@ "integer-gmp" "mtl" "parsec" + "pretty" "process" + "stm" "template-haskell" + "terminfo" "text" "time" "transformers" -- 2.20.1 (Apple Git-117) ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [bug#36493] [PATCH 2/2] gnu: Remove ghc-parsec, ghc-stm, ghc-text, ghc-xhtml. 2019-07-04 7:57 ` [bug#36493] [PATCH 1/2] import: hackage: Update list of ghc-included packages Robert Vollmert @ 2019-07-04 7:57 ` Robert Vollmert 2019-07-04 8:04 ` Robert Vollmert 2019-07-04 8:15 ` Robert Vollmert 0 siblings, 2 replies; 10+ messages in thread From: Robert Vollmert @ 2019-07-04 7:57 UTC (permalink / raw) To: 36493; +Cc: Robert Vollmert 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,bioinformatics,haskell,haskell-apps,haskell-check, haskell-crypto,haskell-web,idris,wm}.scm: Remove dependencies on ghc-parsec, ghc-stm and ghc-text. --- gnu/packages/agda.scm | 2 - gnu/packages/bioinformatics.scm | 2 - gnu/packages/haskell-apps.scm | 5 - gnu/packages/haskell-check.scm | 7 +- gnu/packages/haskell-crypto.scm | 3 +- gnu/packages/haskell-web.scm | 79 ++------- gnu/packages/haskell.scm | 296 +++++--------------------------- gnu/packages/idris.scm | 1 - gnu/packages/wm.scm | 2 - 9 files changed, 55 insertions(+), 342 deletions(-) diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index 646595705b..0f9b4299c3 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -64,9 +64,7 @@ ("ghc-uri-encode" ,ghc-uri-encode) ("ghc-parallel" ,ghc-parallel) ("ghc-regex-tdfa" ,ghc-regex-tdfa) - ("ghc-stm" ,ghc-stm) ("ghc-strict" ,ghc-strict) - ("ghc-text" ,ghc-text) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-zlib" ,ghc-zlib))) (arguments diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8c140a1d24..fc51d4d081 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13973,13 +13973,11 @@ datasets.") ("ghc-intervalmap" ,ghc-intervalmap) ("ghc-missingh" ,ghc-missingh) ("ghc-optparse-applicative" ,ghc-optparse-applicative) - ("ghc-parsec" ,ghc-parsec) ("ghc-regex" ,ghc-regex) ("ghc-safe" ,ghc-safe) ("ghc-safeio" ,ghc-safeio) ("ghc-strict" ,ghc-strict) ("ghc-tar" ,ghc-tar) - ("ghc-text" ,ghc-text) ("ghc-unliftio" ,ghc-unliftio) ("ghc-unliftio-core" ,ghc-unliftio-core) ("ghc-vector" ,ghc-vector) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index d675863090..e01f796178 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -99,7 +99,6 @@ ("ghc-html" ,ghc-html) ("ghc-mmap" ,ghc-mmap) ("ghc-old-time" ,ghc-old-time) - ("ghc-parsec" ,ghc-parsec) ("ghc-random" ,ghc-random) ("ghc-regex-applicative" ,ghc-regex-applicative) ("ghc-regex-compat-tdfa" ,ghc-regex-compat-tdfa) @@ -242,10 +241,8 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}. ("ghc-securemem" ,ghc-securemem) ("ghc-socks" ,ghc-socks) ("ghc-split" ,ghc-split) - ("ghc-stm" ,ghc-stm) ("ghc-stm-chans" ,ghc-stm-chans) ("ghc-tagsoup" ,ghc-tagsoup) - ("ghc-text" ,ghc-text) ("ghc-unix-compat" ,ghc-unix-compat) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-utf8-string" ,ghc-utf8-string) @@ -285,7 +282,6 @@ used to keep a folder in sync between computers.") `(("ghc-exceptions" ,ghc-exceptions) ("ghc-linear" ,ghc-linear) ("ghc-statevar" ,ghc-statevar) - ("ghc-text" ,ghc-text) ("ghc-vector" ,ghc-vector) ("sdl2" ,sdl2))) (native-inputs @@ -347,7 +343,6 @@ programming.") (build-system haskell-build-system) (inputs `(("ghc-sdl2" ,ghc-sdl2) - ("ghc-text" ,ghc-text) ("sdl2-image" ,sdl2-image))) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index d1b2f95515..f9c39c0a5c 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" diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index 8d28a77fc1..28a1647fd1 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -69,8 +69,7 @@ format.") (build-system haskell-build-system) (inputs `(("ghc-hourglass" ,ghc-hourglass) - ("ghc-asn1-types" ,ghc-asn1-types) - ("ghc-text" ,ghc-text))) + ("ghc-asn1-types" ,ghc-asn1-types))) (native-inputs `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) 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))) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index dfb1c5c4a8..ad6d8d4661 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1,3 +1,4 @@ + ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu> @@ -607,8 +608,7 @@ determine the hostname.") (build-system haskell-build-system) (inputs `(("ghc-old-time" ,ghc-old-time) - ("ghc-old-locale" ,ghc-old-locale) - ("ghc-text" ,ghc-text))) + ("ghc-old-locale" ,ghc-old-locale))) (home-page "https://hackage.haskell.org/package/convertible") (synopsis "Typeclasses and instances for converting between types") (description @@ -633,7 +633,6 @@ function performs the conversion you desire.") (base32 "0sx2kc1gw72mjvd8vph8bbjw5whfxfv92rsdhjg1c0al75rf3ka4")))) (build-system haskell-build-system) - (inputs `(("ghc-text" ,ghc-text))) (native-inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-test-framework" ,ghc-test-framework) @@ -939,12 +938,10 @@ efficient memo functions using tries.") ("ghc-generics-sop" ,ghc-generics-sop) ("ghc-hashable" ,ghc-hashable) ("ghc-memotrie" ,ghc-memotrie) - ("ghc-parsec" ,ghc-parsec) ("ghc-parsers" ,ghc-parsers) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-scientific" ,ghc-scientific) ("ghc-tagged" ,ghc-tagged) - ("ghc-text" ,ghc-text) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-uuid-types" ,ghc-uuid-types) ("ghc-vector" ,ghc-vector))) @@ -953,7 +950,6 @@ efficient memo functions using tries.") ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-ansi-terminal" ,ghc-ansi-terminal) ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) - ("ghc-parsec" ,ghc-parsec) ("ghc-trifecta" ,ghc-trifecta) ("ghc-tasty" ,ghc-tasty) ("ghc-tasty-golden" ,ghc-tasty-golden) @@ -1254,8 +1250,7 @@ tool lex or flex for C/C++.") (("QuickCheck >= 2\\.8\\.1 && < 2\\.10") "QuickCheck >= 2.8.1 && < 2.12"))))))) (inputs - `(("ghc-parsec" ,ghc-parsec) - ("ghc-exceptions" ,ghc-exceptions) + `(("ghc-exceptions" ,ghc-exceptions) ("ghc-multipart" ,ghc-multipart) ("ghc-network-uri" ,ghc-network-uri) ("ghc-network" ,ghc-network))) @@ -1491,7 +1486,6 @@ specify refactorings without depending on GHC.") ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-yaml" ,ghc-yaml) ("ghc-vector" ,ghc-vector) - ("ghc-text" ,ghc-text) ("ghc-data-default" ,ghc-data-default) ("ghc-cmdargs" ,ghc-cmdargs) ("ghc-haskell-src-exts" ,ghc-haskell-src-exts) @@ -1709,8 +1703,7 @@ arithmetic.") (inputs `(("ghc-half" ,ghc-half) ("ghc-fixed" ,ghc-fixed) - ("glu" ,glu) - ("ghc-text" ,ghc-text))) + ("glu" ,glu))) (home-page "https://www.haskell.org/haskellwiki/Opengl") (synopsis "Raw Haskell bindings for the OpenGL graphics system") (description "OpenGLRaw is a raw Haskell binding for the OpenGL 4.5 @@ -1791,8 +1784,7 @@ basis for a nicer interface.") "19vxwvx2n8zq2klj176l25n2b64ybp0b8mhm4p46gvpcivz41fjc")))) (build-system haskell-build-system) (inputs - `(("ghc-text" ,ghc-text) - ("ghc-objectname" ,ghc-objectname) + `(("ghc-objectname" ,ghc-objectname) ("ghc-gluraw" ,ghc-gluraw) ("ghc-statevar" ,ghc-statevar) ("ghc-openglraw" ,ghc-openglraw))) @@ -1822,8 +1814,6 @@ version 1.3).") ("ghc-blaze-builder" ,ghc-blaze-builder) ("ghc-network" ,ghc-network) ("ghc-random" ,ghc-random) - ("ghc-stm" ,ghc-stm) - ("ghc-text" ,ghc-text) ("ghc-zlib" ,ghc-zlib))) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) @@ -2057,7 +2047,6 @@ MinTTY and other consoles.") ("ghc-ed25519" ,ghc-ed25519) ("ghc-network" ,ghc-network) ("ghc-network-uri" ,ghc-network-uri) - ("ghc-parsec" ,ghc-parsec) ("ghc-tar" ,ghc-tar) ("ghc-zlib" ,ghc-zlib))) (native-inputs @@ -2137,7 +2126,6 @@ Unix systems.") ("ghc-network" ,ghc-network) ("ghc-random" ,ghc-random) ("ghc-resolv" ,ghc-resolv) - ("ghc-stm" ,ghc-stm) ("ghc-tar" ,ghc-tar) ("ghc-zlib" ,ghc-zlib))) (home-page "https://www.haskell.org/cabal/") @@ -2185,8 +2173,6 @@ configuration. This library provides the common bits for writing custom (sha256 (base32 "1gzy4v3r02kvdxvgg1nj83mmb6aph2v4ilf9c7y6nbvi2x49l0bp")))) (build-system haskell-build-system) - (inputs - `(("ghc-parsec" ,ghc-parsec))) (home-page "https://hackage.haskell.org/package/parsec-numbers") (synopsis "Utilities for parsing numbers from strings") (description @@ -2400,34 +2386,6 @@ suitable for most tasks and for the few cases where more control is needed it provides access to the full zlib feature set.") (license license:bsd-3))) -(define-public ghc-stm - (package - (name "ghc-stm") - (version "2.4.5.0") - (outputs '("out" "doc")) - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/stm/stm-" - version - ".tar.gz")) - (sha256 - (base32 - "19sr11a0hqikhvf561b38phz6k3zg9s157a0f5ffvghk7wcdpmri")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/stm") - (synopsis "Software Transactional Memory") - (description - "Software Transactional Memory, or STM, is an abstraction for concurrent -communication. The main benefits of STM are composability and modularity. -That is, using STM you can write concurrent abstractions that can be easily -composed with any other abstraction built using STM, without exposing the -details of how your abstraction ensures safety. This is typically not the -case with other forms of concurrent communication, such as locks or -@code{MVar}s.") - (license license:bsd-3))) - (define-public ghc-parallel (package (name "ghc-parallel") @@ -2463,8 +2421,6 @@ case with other forms of concurrent communication, such as locks or (base32 "0rpg9j6fy70i0b9dkrip9d6wim0nac0snp7qzbhykjkqlcvvgr91")))) (build-system haskell-build-system) - (inputs - `(("ghc-stm" ,ghc-stm))) (native-inputs `(("ghc-hunit" ,ghc-hunit))) (home-page "https://github.com/ChrisKuklewicz/SafeSemaphore") @@ -2474,38 +2430,6 @@ used in place of @code{QSem}, @code{QSemN}, and @code{SampleVar}, all of which are not exception safe and can be broken by @code{killThread}.") (license license:bsd-3))) -(define-public ghc-text - (package - (name "ghc-text") - (version "1.2.3.0") - (outputs '("out" "doc")) - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/text/text-" - version - ".tar.gz")) - (sha256 - (base32 - "06iir7q99rnffzxi8gagn8w1k9m49368sbidgz634fv1gxib3q10")))) - (build-system haskell-build-system) - ;; The test dependencies depend on ghc-text: ghc-test-framework -> ghc-xml -> ghc-text - (arguments `(#:tests? #f)) - (inputs - `(("ghc-random" ,ghc-random))) - (home-page "https://github.com/bos/text") - (synopsis "Efficient packed Unicode text type library") - (description - "An efficient packed, immutable Unicode text type (both strict and -lazy), with a powerful loop fusion optimization framework. - -The @code{Text} type represents Unicode character strings, in a time and -space-efficient manner. This package provides text processing -capabilities that are optimized for performance critical use, both -in terms of large data quantities and high speed.") - (license license:bsd-3))) - (define-public ghc-text-binary (package (name "ghc-text-binary") @@ -2520,7 +2444,6 @@ in terms of large data quantities and high speed.") (base32 "18gl10pwg3qwsk0za3c70j4n6a9129wwf1b7d3a461h816yv55xn")))) (build-system haskell-build-system) - (inputs `(("ghc-text" ,ghc-text))) (home-page "https://github.com/kawu/text-binary") (synopsis "Binary instances for text types") (description @@ -2566,8 +2489,7 @@ IO operations.") "1gra8gq3kb7b2sd845h55yxlrfqx3ii004c6vjhga8v0b30fzdgc")))) (build-system haskell-build-system) (inputs - `(("ghc-text" ,ghc-text) - ("ghc-random" ,ghc-random))) + `(("ghc-random" ,ghc-random))) (native-inputs `(("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) @@ -2749,8 +2671,7 @@ Hashing\" by Claessen, Pałka for details and the rationale of the design.") "1s256bi0yh0x2hp2gwd30f3mg1cv53zz397dv1yhfsnfzmihrj6h")))) (build-system haskell-build-system) (inputs - `(("ghc-stm" ,ghc-stm) - ("ghc-transformers-compat" ,ghc-transformers-compat))) + `(("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page "https://hackage.haskell.org/package/transformers-compat") (synopsis @@ -2850,8 +2771,7 @@ isn't available, portable implementations are used.") ;; This package needs an older version of tasty. (arguments '(#:tests? #f)) (inputs - `(("ghc-parsec" ,ghc-parsec) - ("ghc-concatenative" ,ghc-concatenative))) + `(("ghc-concatenative" ,ghc-concatenative))) (native-inputs `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-hunit" ,ghc-tasty-hunit))) @@ -2999,8 +2919,7 @@ Haskell library @code{regex-base}.") "1vi11i23gkkjg6193ak90g55akj69bhahy542frkwb68haky4pp3")))) (build-system haskell-build-system) (inputs - `(("ghc-regex-base" ,ghc-regex-base) - ("ghc-parsec" ,ghc-parsec))) + `(("ghc-regex-base" ,ghc-regex-base))) (home-page "https://hackage.haskell.org/package/regex-tdfa") (synopsis "Tagged DFA regex engine for Haskell") @@ -3023,8 +2942,7 @@ Haskell library @code{regex-base}.") "0090g6lgbdm9lywpqm2d3724nnnh24nx3vnlqr96qc2w486pmmrq")))) (build-system haskell-build-system) (inputs - `(("ghc-text" ,ghc-text) - ("ghc-regex-base" ,ghc-regex-base) + `(("ghc-regex-base" ,ghc-regex-base) ("ghc-regex-tdfa" ,ghc-regex-tdfa))) (home-page "http://hackage.haskell.org/package/regex-tdfa-text") @@ -3064,7 +2982,6 @@ Haskell library @code{regex-base}.") ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin) ("ghc-regex-tdfa" ,ghc-regex-tdfa) ("ghc-regex-tdfa-text" ,ghc-regex-tdfa-text) - ("ghc-text" ,ghc-text) ("ghc-time-locale-compat" ,ghc-time-locale-compat) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-utf8-string" ,ghc-utf8-string))) @@ -3099,10 +3016,8 @@ copious examples.") (inputs `(("ghc-base-orphans" ,ghc-base-orphans) ("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-parsec" ,ghc-parsec) ("ghc-scientific" ,ghc-scientific) ("ghc-charset" ,ghc-charset) - ("ghc-text" ,ghc-text) ("ghc-unordered-containers" ,ghc-unordered-containers))) (home-page "https://github.com/ekmett/parsers/") (synopsis "Parsing combinators") @@ -3203,8 +3118,7 @@ with slicing and Clang-style colored diagnostics.") ((", testProperty \"satisfyWith\" satisfyWith") ""))))))) (inputs - `(("ghc-scientific" ,ghc-scientific) - ("ghc-text" ,ghc-text))) + `(("ghc-scientific" ,ghc-scientific))) (native-inputs `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) @@ -3224,8 +3138,7 @@ complicated text/binary file formats.") (name "ghc-attoparsec-bootstrap") (arguments `(#:tests? #f)) (inputs - `(("ghc-scientific" ,ghc-scientific-bootstrap) - ("ghc-text" ,ghc-text))) + `(("ghc-scientific" ,ghc-scientific-bootstrap))) (native-inputs '()) (properties '(hidden? #t)))) @@ -3247,7 +3160,6 @@ complicated text/binary file formats.") (inputs `(("ghc-digest" ,ghc-digest) ("ghc-temporary" ,ghc-temporary) - ("ghc-text" ,ghc-text) ("ghc-zlib" ,ghc-zlib))) (native-inputs `(("ghc-hunit" ,ghc-hunit) @@ -3388,8 +3300,6 @@ and mIRC chat codes.") (base32 "05dya1vdvq29hkhkdlsglzhw7bdn51rvs1javs0q75nf99c66k7m")))) (build-system haskell-build-system) - (inputs - `(("ghc-text" ,ghc-text))) (home-page "http://code.haskell.org/~malcolm/polyparse/") (synopsis @@ -3478,7 +3388,6 @@ this package makes them available back to GHC 7.2.") (inputs `(("ghc-fingertree" ,ghc-fingertree) ("ghc-hashable" ,ghc-hashable) - ("ghc-text" ,ghc-text) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-semigroupoids" ,ghc-semigroupoids) ("ghc-semigroups" ,ghc-semigroups))) @@ -3626,8 +3535,6 @@ online}.") (base32 "0g814lj7vaxvib2g3r734221k80k7ap9czv9hinifn8syals3l9j")))) (build-system haskell-build-system) - (inputs - `(("ghc-text" ,ghc-text))) (home-page "http://code.galois.com") (synopsis "Simple XML library for Haskell") (description "This package provides a simple XML library for Haskell.") @@ -3654,7 +3561,6 @@ online}.") ("ghc-old-locale" ,ghc-old-locale) ("ghc-old-time" ,ghc-old-time) ("ghc-safe" ,ghc-safe) - ("ghc-text" ,ghc-text) ("ghc-time-locale-compat" ,ghc-time-locale-compat) ("ghc-utf8-string" ,ghc-utf8-string) ("ghc-xml-conduit" ,ghc-xml-conduit) @@ -3690,8 +3596,7 @@ consuming feeds in both RSS (Really Simple Syndication) and Atom format.") ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) (inputs - `(("ghc-stm" ,ghc-stm) - ("ghc-transformers-compat" ,ghc-transformers-compat))) + `(("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page "https://github.com/ekmett/exceptions/") (synopsis "Extensible optionally-pure exceptions") (description "This library provides extensible optionally-pure exceptions @@ -3825,8 +3730,7 @@ writing to stdout and other handles.") (build-system haskell-build-system) ;; these inputs are necessary to use this library (inputs - `(("ghc-text" ,ghc-text) - ("ghc-hashable" ,ghc-hashable))) + `(("ghc-hashable" ,ghc-hashable))) (arguments `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. (home-page @@ -4119,36 +4023,6 @@ splitting lists into parts, akin to the @code{split} function found in several mainstream languages.") (license license:bsd-3))) -(define-public ghc-parsec - (package - (name "ghc-parsec") - (version "3.1.13.0") - (outputs '("out" "doc")) - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/parsec/parsec-" - version - ".tar.gz")) - (sha256 - (base32 "1wc09pyn70p8z6llink10c8pqbh6ikyk554911yfwxv1g91swqbq")))) - (build-system haskell-build-system) - (native-inputs - `(("ghc-hunit" ,ghc-hunit))) - (inputs - `(("ghc-text" ,ghc-text))) - (arguments - `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. - (home-page - "https://github.com/aslatter/parsec") - (synopsis "Monadic parser combinators") - (description "Parsec is a parser library. It is simple, safe, well -documented, has extensive libraries, good error messages, and is fast. It is -defined as a monad transformer that can be stacked on arbitrary monads, and it -is also parametric in the input stream type.") - (license license:bsd-3))) - (define-public ghc-parser-combinators (package (name "ghc-parser-combinators") @@ -4190,8 +4064,7 @@ combinators.") (inputs `(("ghc-case-insensitive" ,ghc-case-insensitive) ("ghc-parser-combinators" ,ghc-parser-combinators) - ("ghc-scientific" ,ghc-scientific) - ("ghc-text" ,ghc-text))) + ("ghc-scientific" ,ghc-scientific))) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-hspec" ,ghc-hspec) @@ -4347,11 +4220,10 @@ interface.") (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. + (inputs + `(("ghc-network" ,ghc-network))) (native-inputs `(("ghc-hunit" ,ghc-hunit))) - (inputs - `(("ghc-parsec" ,ghc-parsec) - ("ghc-network" ,ghc-network))) (home-page "https://github.com/haskell/network-uri") (synopsis "Library for URI manipulation") @@ -4535,8 +4407,7 @@ monads with anaphoric variants on @code{if} and @code{when} and a C-like "1c92833gr6cadidjdp8mlznkpp8lyxl0w3y7d19y8yi3klc3843c")))) (build-system haskell-build-system) (inputs - `(("ghc-stm" ,ghc-stm) - ("ghc-transformers-base" ,ghc-transformers-base) + `(("ghc-transformers-base" ,ghc-transformers-base) ("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page "https://github.com/basvandijk/monad-control") (synopsis "Monad transformers to lift control operations like exception @@ -4658,8 +4529,7 @@ pragmas in your code.") (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Missing test libraries. (inputs - `(("ghc-text" ,ghc-text) - ("ghc-utf8-string" ,ghc-utf8-string))) + `(("ghc-utf8-string" ,ghc-utf8-string))) (home-page "https://github.com/lpsmith/blaze-builder") (synopsis "Efficient buffered output") (description "This library provides an implementation of the older @@ -4692,8 +4562,7 @@ interoperate with code that uses the new implementation.") (("tasty >= 1\\.0 && < 1\\.1") "tasty >= 1.0 && < 1.2"))))))) (inputs - `(("ghc-blaze-builder" ,ghc-blaze-builder) - ("ghc-text" ,ghc-text))) + `(("ghc-blaze-builder" ,ghc-blaze-builder))) (native-inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-quickcheck" ,ghc-quickcheck) @@ -4743,8 +4612,7 @@ library for Haskell.") "09whscli1q5z7lzyq9rfk0bq1ydplh6pjmc6qv0x668k5818c2wg")))) (build-system haskell-build-system) (inputs - `(("ghc-stm" ,ghc-stm) - ("ghc-hashable" ,ghc-hashable) + `(("ghc-hashable" ,ghc-hashable) ("ghc-hunit" ,ghc-hunit) ("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) @@ -5083,7 +4951,6 @@ given term should not exist.") ("ghc-profunctors" ,ghc-profunctors) ("ghc-semigroups" ,ghc-semigroups) ("ghc-statevar" ,ghc-statevar) - ("ghc-stm" ,ghc-stm) ("ghc-tagged" ,ghc-tagged) ("ghc-th-abstraction" ,ghc-th-abstraction) ("ghc-transformers-compat" ,ghc-transformers-compat) @@ -5175,8 +5042,6 @@ call stacks with different versions of the compiler.") (base32 "08r2iw0gdmfs4f6wraaq19vfmkjdbics3dbhw39y7mdjd98kcr7b")))) (build-system haskell-build-system) - (inputs - `(("ghc-stm" ,ghc-stm))) (home-page "https://hackage.haskell.org/package/StateVar") (synopsis "State variables for Haskell") (description "This package provides state variables, which are references @@ -5217,7 +5082,6 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") ("ghc-profunctors" ,ghc-profunctors) ("ghc-semigroups" ,ghc-semigroups) ("ghc-tagged" ,ghc-tagged) - ("ghc-text" ,ghc-text) ("ghc-transformers-compat" ,ghc-transformers-compat) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-void" ,ghc-void) @@ -5258,8 +5122,7 @@ indexed variants.") "1hiqi7h76shjzs2zj0j8g6wnq2hbiq1hmfafdazr97fba2zl2432")))) (build-system haskell-build-system) (inputs - `(("ghc-text" ,ghc-text) - ("ghc-blaze-html" ,ghc-blaze-html) + `(("ghc-blaze-html" ,ghc-blaze-html) ("ghc-xss-sanitize" ,ghc-xss-sanitize) ("ghc-data-default" ,ghc-data-default) ("ghc-syb" ,ghc-syb) @@ -5393,7 +5256,6 @@ just a @code{Semigroup} are added.") `(("ghc-nats" ,ghc-nats) ("ghc-tagged" ,ghc-tagged) ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-text" ,ghc-text) ("ghc-hashable" ,ghc-hashable))) (home-page "https://github.com/ekmett/semigroups/") (synopsis "Semigroup operations for Haskell") @@ -5414,7 +5276,6 @@ semigroup.") `(("ghc-nats" ,ghc-nats-bootstrap) ("ghc-tagged" ,ghc-tagged) ("ghc-unordered-containers" ,ghc-unordered-containers-bootstrap) - ("ghc-text" ,ghc-text) ("ghc-hashable" ,ghc-hashable-bootstrap))) (properties '(hidden? #t)))) @@ -5537,7 +5398,6 @@ monad transformer (instead of the IO monad).") (inputs `(("ghc-auto-update" ,ghc-auto-update) ("ghc-easy-file" ,ghc-easy-file) - ("ghc-text" ,ghc-text) ("ghc-unix-time" ,ghc-unix-time))) (native-inputs `(("hspec-discover" ,hspec-discover) @@ -5723,7 +5583,6 @@ in migrated modules.") (build-system haskell-build-system) (inputs `(("ghc-integer-logarithms" ,ghc-integer-logarithms) - ("ghc-text" ,ghc-text) ("ghc-hashable" ,ghc-hashable) ("ghc-primitive" ,ghc-primitive))) (native-inputs @@ -5750,7 +5609,6 @@ notation}.") (arguments `(#:tests? #f)) (inputs `(("ghc-integer-logarithms" ,ghc-integer-logarithms-bootstrap) - ("ghc-text" ,ghc-text) ("ghc-hashable" ,ghc-hashable) ("ghc-primitive" ,ghc-primitive))) (native-inputs '()) @@ -5879,7 +5737,6 @@ building up, manipulating and serialising @code{Pandoc} structures.") ("ghc-temporary" ,ghc-temporary) ("ghc-utf8-string" ,ghc-utf8-string) ("ghc-xml" ,ghc-xml) - ("ghc-parsec" ,ghc-parsec) ("ghc-pandoc-types" ,ghc-pandoc-types))) (home-page "https://github.com/jgm/texmath") (synopsis "Conversion between formats used to represent mathematics") @@ -5955,8 +5812,7 @@ and utilities for pretty printing.") `(("ghc-diff" ,ghc-diff) ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin))) (native-inputs - `(("ghc-parsec" ,ghc-parsec) - ("ghc-blaze-html" ,ghc-blaze-html) + `(("ghc-blaze-html" ,ghc-blaze-html) ("ghc-utf8-string" ,ghc-utf8-string))) (home-page "https://github.com/jgm/highlighting-kate") (synopsis "Syntax highlighting library") @@ -5983,8 +5839,6 @@ descriptions.") (base32 "1c1j3a8b9qx5zk9myqm3gap8ymz7fipwrdmyfsq9wkkdr9x4np45")))) (build-system haskell-build-system) - (inputs - `(("ghc-text" ,ghc-text))) (native-inputs `(("ghc-hunit" ,ghc-hunit))) (home-page "https://github.com/jgm/commonmark-hs") @@ -6010,8 +5864,6 @@ sources, and does not require prior installation of the C library.") (base32 "13b0mqks5c1q989slgsa3ixr5vvkfyic4ynzgv00kgl5qrs7hqk7")))) (build-system haskell-build-system) - (inputs - `(("ghc-text" ,ghc-text))) (native-inputs `(("ghc-hunit" ,ghc-hunit))) (home-page "https://github.com/kivikakk/cmark-gfm-hs") @@ -6168,7 +6020,6 @@ datatypes.") (inputs `(("ghc-th-lift" ,ghc-th-lift) ("ghc-vector" ,ghc-vector) - ("ghc-text" ,ghc-text) ("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://github.com/bennofs/th-lift-instances/") (synopsis "Lift instances for template-haskell for common data types.") @@ -6428,7 +6279,6 @@ back-ends.") ("ghc-aeson" ,ghc-aeson) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-vector" ,ghc-vector) - ("ghc-text" ,ghc-text) ("ghc-attoparsec" ,ghc-attoparsec) ("ghc-scientific" ,ghc-scientific) ("ghc-semigroups" ,ghc-semigroups) @@ -6531,8 +6381,7 @@ TIFF and GIF formats.") (inputs `(("lua" ,lua) ("ghc-exceptions" ,ghc-exceptions) - ("ghc-fail" ,ghc-fail) - ("ghc-text" ,ghc-text))) + ("ghc-fail" ,ghc-fail))) (native-inputs `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-expected-failure" ,ghc-tasty-expected-failure) @@ -6565,8 +6414,7 @@ described in @url{https://www.lua.org/}.") `(#:cabal-revision ("1" "0vajlsd7y6pwa08635q0cx8z5c1c55bk7fvavw7g2vmyvxqjzx6n"))) (inputs - `(("ghc-hslua" ,ghc-hslua) - ("ghc-text" ,ghc-text))) + `(("ghc-hslua" ,ghc-hslua))) (native-inputs `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-hunit" ,ghc-tasty-hunit))) @@ -6764,7 +6612,6 @@ the choice of SSL/TLS, and SOCKS.") ("ghc-hxt" ,ghc-hxt) ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin) ("ghc-safe" ,ghc-safe) - ("ghc-text" ,ghc-text) ("ghc-utf8-string" ,ghc-utf8-string))) (native-inputs `(("ghc-diff" ,ghc-diff) @@ -6818,9 +6665,7 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") `(("ghc-aeson" ,ghc-aeson) ("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))) (native-inputs @@ -6883,7 +6728,6 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") ("ghc-network-uri" ,ghc-network-uri) ("ghc-old-locale" ,ghc-old-locale) ("ghc-pandoc-types" ,ghc-pandoc-types) - ("ghc-parsec" ,ghc-parsec) ("ghc-random" ,ghc-random) ("ghc-scientific" ,ghc-scientific) ("ghc-sha" ,ghc-sha) @@ -6893,7 +6737,6 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") ("ghc-tagsoup" ,ghc-tagsoup) ("ghc-temporary" ,ghc-temporary) ("ghc-texmath" ,ghc-texmath) - ("ghc-text" ,ghc-text) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-vector" ,ghc-vector) ("ghc-xml" ,ghc-xml) @@ -6981,8 +6824,7 @@ better for some purposes.") "0j36vrc9w841m5qbwqra1lwiznx31xfnhin1sm8x2c2739csbpn0")))) (build-system haskell-build-system) (inputs - `(("ghc-async" ,ghc-async) - ("ghc-stm" ,ghc-stm))) + `(("ghc-async" ,ghc-async))) (native-inputs `(("ghc-base64-bytestring" ,ghc-base64-bytestring) ("ghc-hspec" ,ghc-hspec) @@ -7014,7 +6856,6 @@ upon it.") `(("ghc-conduit" ,ghc-conduit) ("ghc-exceptions" ,ghc-exceptions) ("ghc-monad-control" ,ghc-monad-control) - ("ghc-text" ,ghc-text) ("ghc-transformers-base" ,ghc-transformers-base) ("ghc-typed-process" ,ghc-typed-process) ("ghc-async" ,ghc-async) @@ -7023,7 +6864,6 @@ upon it.") ("ghc-network" ,ghc-network) ("ghc-primitive" ,ghc-primitive) ("ghc-resourcet" ,ghc-resourcet) - ("ghc-stm" ,ghc-stm) ("ghc-streaming-commons" ,ghc-streaming-commons) ("ghc-hspec" ,ghc-hspec) ("ghc-bytestring-builder" ,ghc-bytestring-builder) @@ -7053,7 +6893,6 @@ dependencies. The basic idea is that this package should only depend on (base32 "1jgqxsa9p2q3h6nymbfmvhldqrqlwrhrzmwadlyc0li50x0d8dwr")))) (build-system haskell-build-system) - (inputs `(("ghc-text" ,ghc-text))) (home-page "https://john-millikin.com/software/haskell-xml/") (synopsis "Basic types for representing XML") (description "This package provides basic types for representing XML @@ -7078,7 +6917,6 @@ documents.") ("ghc-conduit-extra" ,ghc-conduit-extra) ("ghc-doctest" ,ghc-doctest) ("ghc-resourcet" ,ghc-resourcet) - ("ghc-text" ,ghc-text) ("ghc-xml-types" ,ghc-xml-types) ("ghc-attoparsec" ,ghc-attoparsec) ("ghc-data-default-class" ,ghc-data-default-class) @@ -7127,7 +6965,6 @@ the @code{conduit} package.") ("ghc-pandoc" ,ghc-pandoc) ("ghc-tagsoup" ,ghc-tagsoup) ("ghc-aeson" ,ghc-aeson) - ("ghc-text" ,ghc-text) ("ghc-vector" ,ghc-vector) ("ghc-xml-conduit" ,ghc-xml-conduit) ("ghc-unordered-containers" ,ghc-unordered-containers) @@ -7138,7 +6975,6 @@ the @code{conduit} package.") ("ghc-hs-bibutils" ,ghc-hs-bibutils) ("ghc-rfc5051" ,ghc-rfc5051) ("ghc-syb" ,ghc-syb) - ("ghc-parsec" ,ghc-parsec) ("ghc-old-locale" ,ghc-old-locale) ("ghc-aeson-pretty" ,ghc-aeson-pretty) ("ghc-attoparsec" ,ghc-attoparsec) @@ -7262,8 +7098,7 @@ regular expressions. Parsers can be built using Applicative interface.") "0l7ajnh4hpgggf2a1r9dg0hx2fy679vd2kada5y7r02hy3nfxala")))) (build-system haskell-build-system) (inputs - `(("ghc-parsec" ,ghc-parsec) - ("ghc-regex-base" ,ghc-regex-base))) + `(("ghc-regex-base" ,ghc-regex-base))) (home-page "https://github.com/ChrisKuklewicz/regex-tdfa") (synopsis "POSIX extended regular expressions in Haskell.") (description @@ -7524,8 +7359,7 @@ supported. A module of colour names (\"Data.Colour.Names\") is provided.") "0g3w92rad6x5appfb22rbzcas2ix2h0hy91sdxhq8a4a5cnlrpa0")))) (build-system haskell-build-system) (inputs - `(("ghc-base-compat" ,ghc-base-compat) - ("ghc-text" ,ghc-text))) + `(("ghc-base-compat" ,ghc-base-compat))) (home-page "https://hackage.haskell.org/package/wl-pprint-text") (synopsis "Wadler/Leijen Pretty Printer for Text values") (description @@ -7589,7 +7423,6 @@ for generating graph-like data structures.") ("ghc-fgl-arbitrary" ,ghc-fgl-arbitrary) ("ghc-polyparse" ,ghc-polyparse) ("ghc-temporary" ,ghc-temporary) - ("ghc-text" ,ghc-text) ("ghc-wl-pprint-text" ,ghc-wl-pprint-text))) (native-inputs `(("ghc-hspec" ,ghc-hspec) @@ -7697,8 +7530,7 @@ instance of @code{MonadBase} or @code{MonadBaseControl}.") (arguments `(#:tests? #f)) (inputs - `(("ghc-text" ,ghc-text) - ("ghc-quickcheck" ,ghc-quickcheck))) + `(("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://github.com/fpco/haskell-filesystem") (synopsis "High-level, byte-based file and directory path manipulations") (description @@ -7727,7 +7559,6 @@ increasing type safety.") `(#:tests? #f)) (inputs `(("ghc-system-filepath-bootstrap" ,ghc-system-filepath-bootstrap) - ("ghc-text" ,ghc-text) ("ghc-temporary" ,ghc-temporary))) (home-page "https://github.com/fpco/haskell-filesystem") (synopsis "Consistent file system interaction across GHC versions") @@ -7762,7 +7593,6 @@ which can't be decoded in the current locale encoding.") ("ghc-lifted-async" ,ghc-lifted-async) ("ghc-exceptions" ,ghc-exceptions) ("ghc-enclosed-exceptions" ,ghc-enclosed-exceptions) - ("ghc-text" ,ghc-text) ("ghc-async" ,ghc-async) ("ghc-transformers-base" ,ghc-transformers-base) ("ghc-hunit" ,ghc-hunit) @@ -7819,7 +7649,6 @@ easily work with command-line options.") `(("ghc-options-bootstrap" ,ghc-options-bootstrap) ("ghc-patience" ,ghc-patience) ("ghc-random" ,ghc-random) - ("ghc-text" ,ghc-text) ("ghc-ansi-terminal" ,ghc-ansi-terminal))) (home-page "https://john-millikin.com/software/chell/") (synopsis "Simple and intuitive library for automated testing") @@ -7940,8 +7769,7 @@ easily work with command-line options.") ;; FilePath "/r2\ENQ52\t ;$/o\US=/okG\146\&6\n<u\DC3/5\182\223a\DELN\EOT#\NUL/`[m/\USEKV\ETX([)b6/\ACK\SOo\245\ETBO/f\128\STX`|\EM\"/*\EMA\USD3/\143\&4/\CAN?\SUBee\CANR/9/B0\187Kx4/Vqr\232'b:/\a\234\DLE.\"\179/\ENQ{J/|/G)@^\237/\219ml/\DC3pd\ESC" (arguments `(#:tests? #f)) (inputs - `(("ghc-text" ,ghc-text) - ("ghc-chell" ,ghc-chell) + `(("ghc-chell" ,ghc-chell) ("ghc-chell-quickcheck" ,ghc-chell-quickcheck) ("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://github.com/fpco/haskell-filesystem") @@ -7968,7 +7796,6 @@ increasing type safety.") (build-system haskell-build-system) (inputs `(("ghc-system-filepath" ,ghc-system-filepath) - ("ghc-text" ,ghc-text) ("ghc-chell" ,ghc-chell) ("ghc-temporary" ,ghc-temporary))) (home-page "https://github.com/fpco/haskell-filesystem") @@ -8285,8 +8112,7 @@ accessed or modified.") "19bdbz9wb9jvln6yg6qm0hz0w84bypvkxf0wjhgrgd52f9gidlny")))) (build-system haskell-build-system) (inputs - `(("ghc-text" ,ghc-text) - ("ghc-async" ,ghc-async) + `(("ghc-async" ,ghc-async) ("ghc-unix-compat" ,ghc-unix-compat) ("ghc-hinotify" ,ghc-hinotify) ("ghc-tasty" ,ghc-tasty) @@ -8518,9 +8344,7 @@ handled safely, this is what you're left with.") "13kkfgx58z18jphbg56jn08jn72wi3kvfndlwwx87hqwg7x1dfz6")))) (build-system haskell-build-system) (inputs - `(("ghc-syb" ,ghc-syb) - ("ghc-text" ,ghc-text) - ("ghc-parsec" ,ghc-parsec))) + `(("ghc-syb" ,ghc-syb))) (home-page "https://hackage.haskell.org/package/json") (synopsis "Serializes Haskell data to and from JSON") (description "This package provides a parser and pretty printer for @@ -8578,7 +8402,6 @@ JSON (JavaScript Object Notation) is a lightweight data-interchange format.") ("ghc-persistent" ,ghc-persistent) ("ghc-resourcet" ,ghc-resourcet) ("ghc-tagged" ,ghc-tagged) - ("ghc-text" ,ghc-text) ("ghc-unliftio" ,ghc-unliftio) ("ghc-unordered-containers" ,ghc-unordered-containers))) (native-inputs @@ -8612,7 +8435,6 @@ generated SQL and optimize it for your backend.") (inputs `(("ghc-aeson" ,ghc-aeson) ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-parsec" ,ghc-parsec) ("ghc-regex-tdfa" ,ghc-regex-tdfa))) (home-page "https://github.com/koalaman/shellcheck") (synopsis "Static analysis for shell scripts") @@ -8789,7 +8611,6 @@ matching patterns against file paths.") (build-system haskell-build-system) (inputs `(("ghc-exceptions" ,ghc-exceptions) - ("ghc-text" ,ghc-text) ("ghc-transformers-compat" ,ghc-transformers-compat) ("ghc-unexceptionalio" ,ghc-unexceptionalio) ("ghc-safe" ,ghc-safe))) @@ -9161,8 +8982,7 @@ and regression and autocorrelation analysis. "16m7y7fwrirbjbqqcsfmr4yxa9qvfax6r7pw0zl9ky71ms0wa47p")))) (build-system haskell-build-system) (inputs `(("ghc-vector" ,ghc-vector) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-text" ,ghc-text))) + ("ghc-semigroups" ,ghc-semigroups))) (home-page "https://github.com/snoyberg/mono-traversable") (synopsis "Typeclasses for dealing with various chunked data representations for Haskell") @@ -9375,8 +9195,7 @@ IPv4, IPv6 and MAC addresses.") (("tasty-hunit == 0\\.9\\.\\*") "tasty-hunit") (("tasty-quickcheck == 0\\.8\\.\\*") "tasty-quickcheck"))))))) (inputs `(("ghc-hashable" ,ghc-hashable) - ("ghc-random" ,ghc-random) - ("ghc-text" ,ghc-text))) + ("ghc-random" ,ghc-random))) (native-inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-tasty" ,ghc-tasty) @@ -9422,7 +9241,6 @@ functions.") ("ghc-entropy" ,ghc-entropy) ("ghc-network-info" ,ghc-network-info) ("ghc-random" ,ghc-random) - ("ghc-text" ,ghc-text) ("ghc-uuid-types" ,ghc-uuid-types))) (native-inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-quickcheck" ,ghc-quickcheck) @@ -9449,11 +9267,9 @@ parsing and printing @dfn{Universally Unique Identifiers} or UUIDs.") (base32 "1gah2qwfpzwamnikbc5h4nv6dgvv9h16di9ka7946za3nibyasya")))) (build-system haskell-build-system) - (inputs `(("ghc-stm" ,ghc-stm) - ("ghc-hashable" ,ghc-hashable) + (inputs `(("ghc-hashable" ,ghc-hashable) ("ghc-vector" ,ghc-vector) ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-text" ,ghc-text) ("ghc-scientific" ,ghc-scientific) ("ghc-uuid" ,ghc-uuid) ("ghc-dlist" ,ghc-dlist) @@ -9566,7 +9382,6 @@ vector. ") (build-system haskell-build-system) (inputs `(("ghc-mwc-randam" ,ghc-mwc-random) ("ghc-primitive" ,ghc-primitive) - ("ghc-text" ,ghc-text) ("ghc-vector" ,ghc-vector) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-hashable" ,ghc-hashable) @@ -9600,7 +9415,6 @@ and are often as efficient as hand-written folds.") (build-system haskell-build-system) (inputs `(("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-hashable" ,ghc-hashable) - ("ghc-text" ,ghc-text) ("ghc-vector" ,ghc-vector) ("ghc-vector-algorithms" ,ghc-vector-algorithms) ("ghc-split" ,ghc-split))) @@ -9638,7 +9452,6 @@ data structures as non-empty.") ("ghc-transformers-base" ,ghc-transformers-base) ("ghc-primitive" ,ghc-primitive) ("ghc-vector" ,ghc-vector) - ("ghc-text" ,ghc-text) ("ghc-void" ,ghc-void) ("ghc-mwc-random" ,ghc-mwc-random) ("ghc-unix-compat" ,ghc-unix-compat) @@ -9694,7 +9507,6 @@ as well as a convenient Conduit module.") ("ghc-safe" ,ghc-safe) ("ghc-scientific" ,ghc-scientific) ("ghc-tagged" ,ghc-tagged) - ("ghc-text" ,ghc-text) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-utf8-string" ,ghc-utf8-string) ("ghc-vector" ,ghc-vector) @@ -9785,7 +9597,6 @@ Foundation has the following goals: (base32 "0f27sp09yha43xk9q55sc185jyjs5h7gq2dhsyx6bm9kz9dzqi13")))) (build-system haskell-build-system) - (inputs `(("ghc-stm" ,ghc-stm))) (home-page "https://hackage.haskell.org/package/stm-chans") (synopsis "Additional types of channels for ghc-stm") (description "This Haskell package offers a collection of channel types, @@ -9830,8 +9641,6 @@ operators for looping.") "1z516s4pa9n94zf0l45mylssg07xr1d1m6zrz900p0iv3vfd07mv")))) (build-system haskell-build-system) (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat) - ("ghc-text" ,ghc-text) - ("ghc-stm" ,ghc-stm) ("ghc-stm-chans" ,ghc-stm-chans) ("ghc-lifted-base" ,ghc-lifted-base) ("ghc-resourcet" ,ghc-resourcet) @@ -9866,9 +9675,7 @@ code locations of messages.") (base32 "1vk4b19zvwy4mpwaq9z3l3kfmz75gfyf7alhh0y112gspgpccm23")))) (build-system haskell-build-system) - (inputs `(("ghc-parsec" ,ghc-parsec) - ("ghc-text" ,ghc-text) - ("ghc-aeson" ,ghc-aeson) + (inputs `(("ghc-aeson" ,ghc-aeson) ("ghc-blaze-markup" ,ghc-blaze-markup) ("ghc-blaze-html" ,ghc-blaze-html) ("ghc-exceptions" ,ghc-exceptions) @@ -9926,7 +9733,6 @@ a memory chunk that will be auto-scrubbed after it run out of scope.") (inputs `(("ghc-hashable" ,ghc-hashable) ("ghc-monad-control" ,ghc-monad-control) ("ghc-transformers-base" ,ghc-transformers-base) - ("ghc-stm" ,ghc-stm) ("ghc-vector" ,ghc-vector))) (home-page "https://github.com/bos/pool") (synopsis "Striped resource pooling implementation in Haskell") @@ -9953,8 +9759,7 @@ connections.") `(#:cabal-revision ("1" "06f7pgmmc8456p3hc1y23kz1y127gfczy7s00wz1rls9g2sm2vi4"))) (inputs `(("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-base-compat" ,ghc-base-compat) - ("ghc-text" ,ghc-text))) + ("ghc-base-compat" ,ghc-base-compat))) (home-page "https://github.com/bos/aeson") (synopsis "Parse ISO 8601 dates") (description "Haskell library for parsing of ISO 8601 dates, originally @@ -10037,7 +9842,6 @@ parser that uses ByteStrings for parsing and representing the URI data.") ("ghc-attoparsec-iso8601" ,ghc-attoparsec-iso8601) ("ghc-hashable" ,ghc-hashable) ("ghc-http-types" ,ghc-http-types) - ("ghc-text" ,ghc-text) ("ghc-time-locale-compat" ,ghc-time-locale-compat) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-uri-bytestring" ,ghc-uri-bytestring) @@ -10064,7 +9868,6 @@ Haskell data types to and from HTTP API data.") "1h0yijbf1yiwl50klyafy4ln99j8bib4kgbzviw7fc4y4mwv4sv9")))) (build-system haskell-build-system) (inputs `(("ghc-old-locale" ,ghc-old-locale) - ("ghc-text" ,ghc-text) ("ghc-conduit" ,ghc-conduit) ("ghc-resourcet" ,ghc-resourcet) ("ghc-exceptions" ,ghc-exceptions) @@ -10118,7 +9921,6 @@ way.") ("ghc-exceptions" ,ghc-exceptions) ("ghc-hashable" ,ghc-hashable) ("ghc-scientific" ,ghc-scientific) - ("ghc-text" ,ghc-text) ("ghc-time-locale-compat" ,ghc-time-locale-compat) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-vector" ,ghc-vector) @@ -10150,7 +9952,6 @@ ghc-aeson.") ("2" "03qgwk32krldph3blw5agiqcpccr3649hajyn8wm9k71zz82dpn6"))) (inputs `(("ghc-persistent" ,ghc-persistent) ("ghc-monad-control" ,ghc-monad-control) - ("ghc-text" ,ghc-text) ("ghc-aeson" ,ghc-aeson) ("ghc-aeson-compat" ,ghc-aeson-compat) ("ghc-monad-logger" ,ghc-monad-logger) @@ -10260,7 +10061,6 @@ used both from lens and microlens).") (arguments `(#:tests? #f)) ; FIXME: hspec-discover not in PATH (inputs `(("ghc-async" ,ghc-async) - ("ghc-stm" ,ghc-stm) ("ghc-unliftio-core" ,ghc-unliftio-core))) (native-inputs `(("ghc-hspec" ,ghc-hspec))) (home-page "https://github.com/fpco/unliftio") @@ -10297,8 +10097,7 @@ working with it.") ("ghc-unordered-containers" ,ghc-unordered-containers))) (native-inputs `(("ghc-hspec" ,ghc-hspec) ("ghc-persistent-template" ,ghc-persistent-template) - ("ghc-temporary" ,ghc-temporary) - ("ghc-text" ,ghc-text))) + ("ghc-temporary" ,ghc-temporary))) (home-page "https://www.yesodweb.com/book/persistent") (synopsis "Backend for the persistent library using sqlite3") @@ -10356,7 +10155,6 @@ address string against RFC 5322.") ("cabal-doctest" ,cabal-doctest) ("ghc-doctest" ,ghc-doctest) ("ghc-scientific" ,ghc-scientific) - ("ghc-text" ,ghc-text) ("ghc-transformers-compat" ,ghc-transformers-compat) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-void" ,ghc-void) @@ -10453,7 +10251,6 @@ This package provides an orphan instance.") (arguments '(#:tests? #f)) (inputs `(("ghc-network" ,ghc-network) - ("ghc-parsec" ,ghc-parsec) ("ghc-hunit" ,ghc-hunit) ("ghc-regex-compat" ,ghc-regex-compat) ("ghc-hslogger" ,ghc-hslogger) @@ -10632,7 +10429,6 @@ widths to the Char type.") ("ghc-hashable" ,ghc-hashable) ("ghc-microlens" ,ghc-microlens) ("ghc-primitive" ,ghc-primitive) - ("ghc-text" ,ghc-text) ("ghc-typed-process" ,ghc-typed-process) ("ghc-unliftio" ,ghc-unliftio) ("ghc-unordered-containers" ,ghc-unordered-containers) @@ -10718,7 +10514,6 @@ expose it from another module in the hierarchy. #t)))))) (inputs `(("ghc-utf8-string" ,ghc-utf8-string) - ("ghc-text" ,ghc-text) ("cairo" ,cairo))) (native-inputs `(("ghc-gtk2hs-buildtools" ,ghc-gtk2hs-buildtools) @@ -10775,12 +10570,10 @@ backend for the Charts library.") (build-system haskell-build-system) (inputs `(("ghc-temporary" ,ghc-temporary) - ("ghc-unix-compat" ,ghc-unix-compat) - ("ghc-text" ,ghc-text))) + ("ghc-unix-compat" ,ghc-unix-compat))) (native-inputs `(("ghc-temporary" ,ghc-temporary) ("ghc-unix-compat" ,ghc-unix-compat) - ("ghc-text" ,ghc-text) ("ghc-hspec" ,ghc-hspec) ("hspec-discover" ,hspec-discover))) (home-page "https://github.com/stackbuilders/atomic-write") @@ -10865,8 +10658,7 @@ monadic incremental interface is provided as well.") "0paapljn7nqfzrx889y0n8sszci38mdiaxkgr0bb00ph9246rr7z")))) (build-system haskell-build-system) (inputs - `(("ghc-stm" ,ghc-stm) - ("ghc-stm-chans" ,ghc-stm-chans) + `(("ghc-stm-chans" ,ghc-stm-chans) ("ghc-cereal" ,ghc-cereal) ("ghc-cereal-conduit" ,ghc-cereal-conduit) ("ghc-conduit" ,ghc-conduit) @@ -11021,7 +10813,6 @@ based on a binomial heap.") ("ghc-monad-control" ,ghc-monad-control) ("ghc-pqueue" ,ghc-pqueue) ("ghc-resourcet" ,ghc-resourcet) - ("ghc-stm" ,ghc-stm) ("ghc-stm-conduit" ,ghc-stm-conduit) ("ghc-streaming-commons" ,ghc-streaming-commons) ("ghc-unliftio-core" ,ghc-unliftio-core) @@ -11058,7 +10849,6 @@ level asynchronous processing and some other utilities.") ("ghc-hspec" ,ghc-hspec) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) - ("ghc-text" ,ghc-text) ("hspec-discover" ,hspec-discover))) (home-page "https://github.com/sol/interpolate") (synopsis "String interpolation library") @@ -11088,7 +10878,6 @@ Haskell.") ("ghc-http-client-tls" ,ghc-http-client-tls) ("ghc-http-types" ,ghc-http-types) ("ghc-scientific" ,ghc-scientific) - ("ghc-text" ,ghc-text) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-vector" ,ghc-vector) ("ghc-yaml" ,ghc-yaml))) @@ -11153,7 +10942,6 @@ DOS/Windows paths and markup languages (such as XML).") `(("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) ("ghc-cryptohash" ,ghc-cryptohash) ("ghc-hashable" ,ghc-hashable) - ("ghc-parsec" ,ghc-parsec) ("ghc-parsers" ,ghc-parsers) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-vector" ,ghc-vector))) @@ -11332,7 +11120,6 @@ from strict or lazy bytestrings.") (inputs `(("ghc-attoparsec" ,ghc-attoparsec) ("ghc-hashable" ,ghc-hashable) - ("ghc-text" ,ghc-text) ("ghc-unix-compat" ,ghc-unix-compat) ("ghc-unordered-containers" ,ghc-unordered-containers))) (native-inputs @@ -11463,7 +11250,6 @@ man pages with practical examples.") ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) ("ghc-hunit" ,ghc-hunit) ("ghc-shelly" ,ghc-shelly) - ("ghc-text" ,ghc-text) ("gcc" ,gcc))) (arguments `(;; XXX: Test failures are induced by a parse error in <bits/floatn.h> @@ -11516,7 +11302,6 @@ imported with the correct Haskell types.") (inputs `(("ghc-attoparsec" ,ghc-attoparsec) ("ghc-old-locale" ,ghc-old-locale) - ("ghc-text" ,ghc-text) ("ghc-data-default-class" ,ghc-data-default-class) ("ghc-network" ,ghc-network) ("ghc-utf8-string" ,ghc-utf8-string))) @@ -11710,7 +11495,6 @@ example of, \"An applicative functor that is not a monad.\"") (build-system haskell-build-system) (inputs `(("ghc-async" ,ghc-async) - ("ghc-stm" ,ghc-stm) ("ghc-exceptions" ,ghc-exceptions) ("ghc-ansi-terminal" ,ghc-ansi-terminal) ("ghc-terminal-size" ,ghc-terminal-size))) diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index ec3eb15d63..4290d8c21f 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -78,7 +78,6 @@ ("ghc-safe" ,ghc-safe) ("ghc-split" ,ghc-split) ("ghc-terminal-size" ,ghc-terminal-size) - ("ghc-text" ,ghc-text) ("ghc-uniplate" ,ghc-uniplate) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-utf8-string" ,ghc-utf8-string) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 90bc7fc883..a1ad7ac99b 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -596,10 +596,8 @@ tiled on several screens.") `(("ghc-hinotify" ,ghc-hinotify) ("ghc-http" ,ghc-http) ("ghc-iwlib" ,ghc-iwlib) - ("ghc-parsec" ,ghc-parsec) ("ghc-parsec-numbers" ,ghc-parsec-numbers) ("ghc-regex-compat" ,ghc-regex-compat) - ("ghc-stm" ,ghc-stm) ("ghc-x11-xft" ,ghc-x11-xft) ("libxpm" ,libxpm))) (arguments -- 2.20.1 (Apple Git-117) ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [bug#36493] [PATCH 2/2] gnu: Remove ghc-parsec, ghc-stm, ghc-text, ghc-xhtml. 2019-07-04 7:57 ` [bug#36493] [PATCH 2/2] gnu: Remove ghc-parsec, ghc-stm, ghc-text, ghc-xhtml Robert Vollmert @ 2019-07-04 8:04 ` Robert Vollmert 2019-07-04 8:15 ` Robert Vollmert 1 sibling, 0 replies; 10+ messages in thread From: Robert Vollmert @ 2019-07-04 8:04 UTC (permalink / raw) Cc: 36493 > On 4. Jul 2019, at 09:57, Robert Vollmert <rob@vllmrt.net> wrote: > > 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,bioinformatics,haskell,haskell-apps,haskell-check, > haskell-crypto,haskell-web,idris,wm}.scm: Remove dependencies on > ghc-parsec, ghc-stm and ghc-text. > --- > gnu/packages/agda.scm | 2 - > gnu/packages/bioinformatics.scm | 2 - > gnu/packages/haskell-apps.scm | 5 - > gnu/packages/haskell-check.scm | 7 +- > gnu/packages/haskell-crypto.scm | 3 +- > gnu/packages/haskell-web.scm | 79 ++------- > gnu/packages/haskell.scm | 296 +++++--------------------------- > gnu/packages/idris.scm | 1 - > gnu/packages/wm.scm | 2 - > 9 files changed, 55 insertions(+), 342 deletions(-) > > diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm > index 646595705b..0f9b4299c3 100644 > --- a/gnu/packages/agda.scm > +++ b/gnu/packages/agda.scm > @@ -64,9 +64,7 @@ > ("ghc-uri-encode" ,ghc-uri-encode) > ("ghc-parallel" ,ghc-parallel) > ("ghc-regex-tdfa" ,ghc-regex-tdfa) > - ("ghc-stm" ,ghc-stm) > ("ghc-strict" ,ghc-strict) > - ("ghc-text" ,ghc-text) > ("ghc-unordered-containers" ,ghc-unordered-containers) > ("ghc-zlib" ,ghc-zlib))) > (arguments > diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm > index 8c140a1d24..fc51d4d081 100644 > --- a/gnu/packages/bioinformatics.scm > +++ b/gnu/packages/bioinformatics.scm > @@ -13973,13 +13973,11 @@ datasets.") > ("ghc-intervalmap" ,ghc-intervalmap) > ("ghc-missingh" ,ghc-missingh) > ("ghc-optparse-applicative" ,ghc-optparse-applicative) > - ("ghc-parsec" ,ghc-parsec) > ("ghc-regex" ,ghc-regex) > ("ghc-safe" ,ghc-safe) > ("ghc-safeio" ,ghc-safeio) > ("ghc-strict" ,ghc-strict) > ("ghc-tar" ,ghc-tar) > - ("ghc-text" ,ghc-text) > ("ghc-unliftio" ,ghc-unliftio) > ("ghc-unliftio-core" ,ghc-unliftio-core) > ("ghc-vector" ,ghc-vector) > diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm > index d675863090..e01f796178 100644 > --- a/gnu/packages/haskell-apps.scm > +++ b/gnu/packages/haskell-apps.scm > @@ -99,7 +99,6 @@ > ("ghc-html" ,ghc-html) > ("ghc-mmap" ,ghc-mmap) > ("ghc-old-time" ,ghc-old-time) > - ("ghc-parsec" ,ghc-parsec) > ("ghc-random" ,ghc-random) > ("ghc-regex-applicative" ,ghc-regex-applicative) > ("ghc-regex-compat-tdfa" ,ghc-regex-compat-tdfa) > @@ -242,10 +241,8 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}. > ("ghc-securemem" ,ghc-securemem) > ("ghc-socks" ,ghc-socks) > ("ghc-split" ,ghc-split) > - ("ghc-stm" ,ghc-stm) > ("ghc-stm-chans" ,ghc-stm-chans) > ("ghc-tagsoup" ,ghc-tagsoup) > - ("ghc-text" ,ghc-text) > ("ghc-unix-compat" ,ghc-unix-compat) > ("ghc-unordered-containers" ,ghc-unordered-containers) > ("ghc-utf8-string" ,ghc-utf8-string) > @@ -285,7 +282,6 @@ used to keep a folder in sync between computers.") > `(("ghc-exceptions" ,ghc-exceptions) > ("ghc-linear" ,ghc-linear) > ("ghc-statevar" ,ghc-statevar) > - ("ghc-text" ,ghc-text) > ("ghc-vector" ,ghc-vector) > ("sdl2" ,sdl2))) > (native-inputs > @@ -347,7 +343,6 @@ programming.") > (build-system haskell-build-system) > (inputs > `(("ghc-sdl2" ,ghc-sdl2) > - ("ghc-text" ,ghc-text) > ("sdl2-image" ,sdl2-image))) > (native-inputs > `(("pkg-config" ,pkg-config))) > diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm > index d1b2f95515..f9c39c0a5c 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" > diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm > index 8d28a77fc1..28a1647fd1 100644 > --- a/gnu/packages/haskell-crypto.scm > +++ b/gnu/packages/haskell-crypto.scm > @@ -69,8 +69,7 @@ format.") > (build-system haskell-build-system) > (inputs > `(("ghc-hourglass" ,ghc-hourglass) > - ("ghc-asn1-types" ,ghc-asn1-types) > - ("ghc-text" ,ghc-text))) > + ("ghc-asn1-types" ,ghc-asn1-types))) > (native-inputs > `(("ghc-tasty" ,ghc-tasty) > ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) > 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))) > diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm > index dfb1c5c4a8..ad6d8d4661 100644 > --- a/gnu/packages/haskell.scm > +++ b/gnu/packages/haskell.scm > @@ -1,3 +1,4 @@ > + > ;;; GNU Guix --- Functional package management for GNU > ;;; Copyright © 2015, 2016 Federico Beffa <beffa@fbengineering.ch> > ;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu> > @@ -607,8 +608,7 @@ determine the hostname.") > (build-system haskell-build-system) > (inputs > `(("ghc-old-time" ,ghc-old-time) > - ("ghc-old-locale" ,ghc-old-locale) > - ("ghc-text" ,ghc-text))) > + ("ghc-old-locale" ,ghc-old-locale))) > (home-page "https://hackage.haskell.org/package/convertible") > (synopsis "Typeclasses and instances for converting between types") > (description > @@ -633,7 +633,6 @@ function performs the conversion you desire.") > (base32 > "0sx2kc1gw72mjvd8vph8bbjw5whfxfv92rsdhjg1c0al75rf3ka4")))) > (build-system haskell-build-system) > - (inputs `(("ghc-text" ,ghc-text))) > (native-inputs > `(("ghc-hunit" ,ghc-hunit) > ("ghc-test-framework" ,ghc-test-framework) > @@ -939,12 +938,10 @@ efficient memo functions using tries.") > ("ghc-generics-sop" ,ghc-generics-sop) > ("ghc-hashable" ,ghc-hashable) > ("ghc-memotrie" ,ghc-memotrie) > - ("ghc-parsec" ,ghc-parsec) > ("ghc-parsers" ,ghc-parsers) > ("ghc-quickcheck" ,ghc-quickcheck) > ("ghc-scientific" ,ghc-scientific) > ("ghc-tagged" ,ghc-tagged) > - ("ghc-text" ,ghc-text) > ("ghc-unordered-containers" ,ghc-unordered-containers) > ("ghc-uuid-types" ,ghc-uuid-types) > ("ghc-vector" ,ghc-vector))) > @@ -953,7 +950,6 @@ efficient memo functions using tries.") > ("ghc-quickcheck" ,ghc-quickcheck) > ("ghc-ansi-terminal" ,ghc-ansi-terminal) > ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) > - ("ghc-parsec" ,ghc-parsec) > ("ghc-trifecta" ,ghc-trifecta) > ("ghc-tasty" ,ghc-tasty) > ("ghc-tasty-golden" ,ghc-tasty-golden) > @@ -1254,8 +1250,7 @@ tool lex or flex for C/C++.") > (("QuickCheck >= 2\\.8\\.1 && < 2\\.10") > "QuickCheck >= 2.8.1 && < 2.12"))))))) > (inputs > - `(("ghc-parsec" ,ghc-parsec) > - ("ghc-exceptions" ,ghc-exceptions) > + `(("ghc-exceptions" ,ghc-exceptions) > ("ghc-multipart" ,ghc-multipart) > ("ghc-network-uri" ,ghc-network-uri) > ("ghc-network" ,ghc-network))) > @@ -1491,7 +1486,6 @@ specify refactorings without depending on GHC.") > ("ghc-unordered-containers" ,ghc-unordered-containers) > ("ghc-yaml" ,ghc-yaml) > ("ghc-vector" ,ghc-vector) > - ("ghc-text" ,ghc-text) > ("ghc-data-default" ,ghc-data-default) > ("ghc-cmdargs" ,ghc-cmdargs) > ("ghc-haskell-src-exts" ,ghc-haskell-src-exts) > @@ -1709,8 +1703,7 @@ arithmetic.") > (inputs > `(("ghc-half" ,ghc-half) > ("ghc-fixed" ,ghc-fixed) > - ("glu" ,glu) > - ("ghc-text" ,ghc-text))) > + ("glu" ,glu))) > (home-page "https://www.haskell.org/haskellwiki/Opengl") > (synopsis "Raw Haskell bindings for the OpenGL graphics system") > (description "OpenGLRaw is a raw Haskell binding for the OpenGL 4.5 > @@ -1791,8 +1784,7 @@ basis for a nicer interface.") > "19vxwvx2n8zq2klj176l25n2b64ybp0b8mhm4p46gvpcivz41fjc")))) > (build-system haskell-build-system) > (inputs > - `(("ghc-text" ,ghc-text) > - ("ghc-objectname" ,ghc-objectname) > + `(("ghc-objectname" ,ghc-objectname) > ("ghc-gluraw" ,ghc-gluraw) > ("ghc-statevar" ,ghc-statevar) > ("ghc-openglraw" ,ghc-openglraw))) > @@ -1822,8 +1814,6 @@ version 1.3).") > ("ghc-blaze-builder" ,ghc-blaze-builder) > ("ghc-network" ,ghc-network) > ("ghc-random" ,ghc-random) > - ("ghc-stm" ,ghc-stm) > - ("ghc-text" ,ghc-text) > ("ghc-zlib" ,ghc-zlib))) > (native-inputs > `(("ghc-quickcheck" ,ghc-quickcheck) > @@ -2057,7 +2047,6 @@ MinTTY and other consoles.") > ("ghc-ed25519" ,ghc-ed25519) > ("ghc-network" ,ghc-network) > ("ghc-network-uri" ,ghc-network-uri) > - ("ghc-parsec" ,ghc-parsec) > ("ghc-tar" ,ghc-tar) > ("ghc-zlib" ,ghc-zlib))) > (native-inputs > @@ -2137,7 +2126,6 @@ Unix systems.") > ("ghc-network" ,ghc-network) > ("ghc-random" ,ghc-random) > ("ghc-resolv" ,ghc-resolv) > - ("ghc-stm" ,ghc-stm) > ("ghc-tar" ,ghc-tar) > ("ghc-zlib" ,ghc-zlib))) > (home-page "https://www.haskell.org/cabal/") > @@ -2185,8 +2173,6 @@ configuration. This library provides the common bits for writing custom > (sha256 > (base32 "1gzy4v3r02kvdxvgg1nj83mmb6aph2v4ilf9c7y6nbvi2x49l0bp")))) > (build-system haskell-build-system) > - (inputs > - `(("ghc-parsec" ,ghc-parsec))) > (home-page "https://hackage.haskell.org/package/parsec-numbers") > (synopsis "Utilities for parsing numbers from strings") > (description > @@ -2400,34 +2386,6 @@ suitable for most tasks and for the few cases where more control is needed it > provides access to the full zlib feature set.") > (license license:bsd-3))) > > -(define-public ghc-stm > - (package > - (name "ghc-stm") > - (version "2.4.5.0") > - (outputs '("out" "doc")) > - (source > - (origin > - (method url-fetch) > - (uri (string-append > - "https://hackage.haskell.org/package/stm/stm-" > - version > - ".tar.gz")) > - (sha256 > - (base32 > - "19sr11a0hqikhvf561b38phz6k3zg9s157a0f5ffvghk7wcdpmri")))) > - (build-system haskell-build-system) > - (home-page "https://hackage.haskell.org/package/stm") > - (synopsis "Software Transactional Memory") > - (description > - "Software Transactional Memory, or STM, is an abstraction for concurrent > -communication. The main benefits of STM are composability and modularity. > -That is, using STM you can write concurrent abstractions that can be easily > -composed with any other abstraction built using STM, without exposing the > -details of how your abstraction ensures safety. This is typically not the > -case with other forms of concurrent communication, such as locks or > -@code{MVar}s.") > - (license license:bsd-3))) > - > (define-public ghc-parallel > (package > (name "ghc-parallel") > @@ -2463,8 +2421,6 @@ case with other forms of concurrent communication, such as locks or > (base32 > "0rpg9j6fy70i0b9dkrip9d6wim0nac0snp7qzbhykjkqlcvvgr91")))) > (build-system haskell-build-system) > - (inputs > - `(("ghc-stm" ,ghc-stm))) > (native-inputs > `(("ghc-hunit" ,ghc-hunit))) > (home-page "https://github.com/ChrisKuklewicz/SafeSemaphore") > @@ -2474,38 +2430,6 @@ used in place of @code{QSem}, @code{QSemN}, and @code{SampleVar}, all of which > are not exception safe and can be broken by @code{killThread}.") > (license license:bsd-3))) > > -(define-public ghc-text > - (package > - (name "ghc-text") > - (version "1.2.3.0") > - (outputs '("out" "doc")) > - (source > - (origin > - (method url-fetch) > - (uri (string-append > - "https://hackage.haskell.org/package/text/text-" > - version > - ".tar.gz")) > - (sha256 > - (base32 > - "06iir7q99rnffzxi8gagn8w1k9m49368sbidgz634fv1gxib3q10")))) > - (build-system haskell-build-system) > - ;; The test dependencies depend on ghc-text: ghc-test-framework -> ghc-xml -> ghc-text > - (arguments `(#:tests? #f)) > - (inputs > - `(("ghc-random" ,ghc-random))) > - (home-page "https://github.com/bos/text") > - (synopsis "Efficient packed Unicode text type library") > - (description > - "An efficient packed, immutable Unicode text type (both strict and > -lazy), with a powerful loop fusion optimization framework. > - > -The @code{Text} type represents Unicode character strings, in a time and > -space-efficient manner. This package provides text processing > -capabilities that are optimized for performance critical use, both > -in terms of large data quantities and high speed.") > - (license license:bsd-3))) > - > (define-public ghc-text-binary > (package > (name "ghc-text-binary") > @@ -2520,7 +2444,6 @@ in terms of large data quantities and high speed.") > (base32 > "18gl10pwg3qwsk0za3c70j4n6a9129wwf1b7d3a461h816yv55xn")))) > (build-system haskell-build-system) > - (inputs `(("ghc-text" ,ghc-text))) > (home-page "https://github.com/kawu/text-binary") > (synopsis "Binary instances for text types") > (description > @@ -2566,8 +2489,7 @@ IO operations.") > "1gra8gq3kb7b2sd845h55yxlrfqx3ii004c6vjhga8v0b30fzdgc")))) > (build-system haskell-build-system) > (inputs > - `(("ghc-text" ,ghc-text) > - ("ghc-random" ,ghc-random))) > + `(("ghc-random" ,ghc-random))) > (native-inputs > `(("ghc-test-framework" ,ghc-test-framework) > ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) > @@ -2749,8 +2671,7 @@ Hashing\" by Claessen, Pałka for details and the rationale of the design.") > "1s256bi0yh0x2hp2gwd30f3mg1cv53zz397dv1yhfsnfzmihrj6h")))) > (build-system haskell-build-system) > (inputs > - `(("ghc-stm" ,ghc-stm) > - ("ghc-transformers-compat" ,ghc-transformers-compat))) > + `(("ghc-transformers-compat" ,ghc-transformers-compat))) > (home-page > "https://hackage.haskell.org/package/transformers-compat") > (synopsis > @@ -2850,8 +2771,7 @@ isn't available, portable implementations are used.") > ;; This package needs an older version of tasty. > (arguments '(#:tests? #f)) > (inputs > - `(("ghc-parsec" ,ghc-parsec) > - ("ghc-concatenative" ,ghc-concatenative))) > + `(("ghc-concatenative" ,ghc-concatenative))) > (native-inputs > `(("ghc-tasty" ,ghc-tasty) > ("ghc-tasty-hunit" ,ghc-tasty-hunit))) > @@ -2999,8 +2919,7 @@ Haskell library @code{regex-base}.") > "1vi11i23gkkjg6193ak90g55akj69bhahy542frkwb68haky4pp3")))) > (build-system haskell-build-system) > (inputs > - `(("ghc-regex-base" ,ghc-regex-base) > - ("ghc-parsec" ,ghc-parsec))) > + `(("ghc-regex-base" ,ghc-regex-base))) > (home-page > "https://hackage.haskell.org/package/regex-tdfa") > (synopsis "Tagged DFA regex engine for Haskell") > @@ -3023,8 +2942,7 @@ Haskell library @code{regex-base}.") > "0090g6lgbdm9lywpqm2d3724nnnh24nx3vnlqr96qc2w486pmmrq")))) > (build-system haskell-build-system) > (inputs > - `(("ghc-text" ,ghc-text) > - ("ghc-regex-base" ,ghc-regex-base) > + `(("ghc-regex-base" ,ghc-regex-base) > ("ghc-regex-tdfa" ,ghc-regex-tdfa))) > (home-page > "http://hackage.haskell.org/package/regex-tdfa-text") > @@ -3064,7 +2982,6 @@ Haskell library @code{regex-base}.") > ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin) > ("ghc-regex-tdfa" ,ghc-regex-tdfa) > ("ghc-regex-tdfa-text" ,ghc-regex-tdfa-text) > - ("ghc-text" ,ghc-text) > ("ghc-time-locale-compat" ,ghc-time-locale-compat) > ("ghc-unordered-containers" ,ghc-unordered-containers) > ("ghc-utf8-string" ,ghc-utf8-string))) > @@ -3099,10 +3016,8 @@ copious examples.") > (inputs > `(("ghc-base-orphans" ,ghc-base-orphans) > ("ghc-attoparsec" ,ghc-attoparsec) > - ("ghc-parsec" ,ghc-parsec) > ("ghc-scientific" ,ghc-scientific) > ("ghc-charset" ,ghc-charset) > - ("ghc-text" ,ghc-text) > ("ghc-unordered-containers" ,ghc-unordered-containers))) > (home-page "https://github.com/ekmett/parsers/") > (synopsis "Parsing combinators") > @@ -3203,8 +3118,7 @@ with slicing and Clang-style colored diagnostics.") > ((", testProperty \"satisfyWith\" satisfyWith") > ""))))))) > (inputs > - `(("ghc-scientific" ,ghc-scientific) > - ("ghc-text" ,ghc-text))) > + `(("ghc-scientific" ,ghc-scientific))) > (native-inputs > `(("ghc-tasty" ,ghc-tasty) > ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) > @@ -3224,8 +3138,7 @@ complicated text/binary file formats.") > (name "ghc-attoparsec-bootstrap") > (arguments `(#:tests? #f)) > (inputs > - `(("ghc-scientific" ,ghc-scientific-bootstrap) > - ("ghc-text" ,ghc-text))) > + `(("ghc-scientific" ,ghc-scientific-bootstrap))) > (native-inputs '()) > (properties '(hidden? #t)))) > > @@ -3247,7 +3160,6 @@ complicated text/binary file formats.") > (inputs > `(("ghc-digest" ,ghc-digest) > ("ghc-temporary" ,ghc-temporary) > - ("ghc-text" ,ghc-text) > ("ghc-zlib" ,ghc-zlib))) > (native-inputs > `(("ghc-hunit" ,ghc-hunit) > @@ -3388,8 +3300,6 @@ and mIRC chat codes.") > (base32 > "05dya1vdvq29hkhkdlsglzhw7bdn51rvs1javs0q75nf99c66k7m")))) > (build-system haskell-build-system) > - (inputs > - `(("ghc-text" ,ghc-text))) > (home-page > "http://code.haskell.org/~malcolm/polyparse/") > (synopsis > @@ -3478,7 +3388,6 @@ this package makes them available back to GHC 7.2.") > (inputs > `(("ghc-fingertree" ,ghc-fingertree) > ("ghc-hashable" ,ghc-hashable) > - ("ghc-text" ,ghc-text) > ("ghc-unordered-containers" ,ghc-unordered-containers) > ("ghc-semigroupoids" ,ghc-semigroupoids) > ("ghc-semigroups" ,ghc-semigroups))) > @@ -3626,8 +3535,6 @@ online}.") > (base32 > "0g814lj7vaxvib2g3r734221k80k7ap9czv9hinifn8syals3l9j")))) > (build-system haskell-build-system) > - (inputs > - `(("ghc-text" ,ghc-text))) > (home-page "http://code.galois.com") > (synopsis "Simple XML library for Haskell") > (description "This package provides a simple XML library for Haskell.") > @@ -3654,7 +3561,6 @@ online}.") > ("ghc-old-locale" ,ghc-old-locale) > ("ghc-old-time" ,ghc-old-time) > ("ghc-safe" ,ghc-safe) > - ("ghc-text" ,ghc-text) > ("ghc-time-locale-compat" ,ghc-time-locale-compat) > ("ghc-utf8-string" ,ghc-utf8-string) > ("ghc-xml-conduit" ,ghc-xml-conduit) > @@ -3690,8 +3596,7 @@ consuming feeds in both RSS (Really Simple Syndication) and Atom format.") > ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) > ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) > (inputs > - `(("ghc-stm" ,ghc-stm) > - ("ghc-transformers-compat" ,ghc-transformers-compat))) > + `(("ghc-transformers-compat" ,ghc-transformers-compat))) > (home-page "https://github.com/ekmett/exceptions/") > (synopsis "Extensible optionally-pure exceptions") > (description "This library provides extensible optionally-pure exceptions > @@ -3825,8 +3730,7 @@ writing to stdout and other handles.") > (build-system haskell-build-system) > ;; these inputs are necessary to use this library > (inputs > - `(("ghc-text" ,ghc-text) > - ("ghc-hashable" ,ghc-hashable))) > + `(("ghc-hashable" ,ghc-hashable))) > (arguments > `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. > (home-page > @@ -4119,36 +4023,6 @@ splitting lists into parts, akin to the @code{split} function found in several > mainstream languages.") > (license license:bsd-3))) > > -(define-public ghc-parsec > - (package > - (name "ghc-parsec") > - (version "3.1.13.0") > - (outputs '("out" "doc")) > - (source > - (origin > - (method url-fetch) > - (uri (string-append > - "https://hackage.haskell.org/package/parsec/parsec-" > - version > - ".tar.gz")) > - (sha256 > - (base32 "1wc09pyn70p8z6llink10c8pqbh6ikyk554911yfwxv1g91swqbq")))) > - (build-system haskell-build-system) > - (native-inputs > - `(("ghc-hunit" ,ghc-hunit))) > - (inputs > - `(("ghc-text" ,ghc-text))) > - (arguments > - `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. > - (home-page > - "https://github.com/aslatter/parsec") > - (synopsis "Monadic parser combinators") > - (description "Parsec is a parser library. It is simple, safe, well > -documented, has extensive libraries, good error messages, and is fast. It is > -defined as a monad transformer that can be stacked on arbitrary monads, and it > -is also parametric in the input stream type.") > - (license license:bsd-3))) > - > (define-public ghc-parser-combinators > (package > (name "ghc-parser-combinators") > @@ -4190,8 +4064,7 @@ combinators.") > (inputs > `(("ghc-case-insensitive" ,ghc-case-insensitive) > ("ghc-parser-combinators" ,ghc-parser-combinators) > - ("ghc-scientific" ,ghc-scientific) > - ("ghc-text" ,ghc-text))) > + ("ghc-scientific" ,ghc-scientific))) > (native-inputs > `(("ghc-quickcheck" ,ghc-quickcheck) > ("ghc-hspec" ,ghc-hspec) > @@ -4347,11 +4220,10 @@ interface.") > (build-system haskell-build-system) > (arguments > `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. > + (inputs > + `(("ghc-network" ,ghc-network))) > (native-inputs > `(("ghc-hunit" ,ghc-hunit))) > - (inputs > - `(("ghc-parsec" ,ghc-parsec) > - ("ghc-network" ,ghc-network))) > (home-page > "https://github.com/haskell/network-uri") > (synopsis "Library for URI manipulation") > @@ -4535,8 +4407,7 @@ monads with anaphoric variants on @code{if} and @code{when} and a C-like > "1c92833gr6cadidjdp8mlznkpp8lyxl0w3y7d19y8yi3klc3843c")))) > (build-system haskell-build-system) > (inputs > - `(("ghc-stm" ,ghc-stm) > - ("ghc-transformers-base" ,ghc-transformers-base) > + `(("ghc-transformers-base" ,ghc-transformers-base) > ("ghc-transformers-compat" ,ghc-transformers-compat))) > (home-page "https://github.com/basvandijk/monad-control") > (synopsis "Monad transformers to lift control operations like exception > @@ -4658,8 +4529,7 @@ pragmas in your code.") > (build-system haskell-build-system) > (arguments `(#:tests? #f)) ; FIXME: Missing test libraries. > (inputs > - `(("ghc-text" ,ghc-text) > - ("ghc-utf8-string" ,ghc-utf8-string))) > + `(("ghc-utf8-string" ,ghc-utf8-string))) > (home-page "https://github.com/lpsmith/blaze-builder") > (synopsis "Efficient buffered output") > (description "This library provides an implementation of the older > @@ -4692,8 +4562,7 @@ interoperate with code that uses the new implementation.") > (("tasty >= 1\\.0 && < 1\\.1") > "tasty >= 1.0 && < 1.2"))))))) > (inputs > - `(("ghc-blaze-builder" ,ghc-blaze-builder) > - ("ghc-text" ,ghc-text))) > + `(("ghc-blaze-builder" ,ghc-blaze-builder))) > (native-inputs > `(("ghc-hunit" ,ghc-hunit) > ("ghc-quickcheck" ,ghc-quickcheck) > @@ -4743,8 +4612,7 @@ library for Haskell.") > "09whscli1q5z7lzyq9rfk0bq1ydplh6pjmc6qv0x668k5818c2wg")))) > (build-system haskell-build-system) > (inputs > - `(("ghc-stm" ,ghc-stm) > - ("ghc-hashable" ,ghc-hashable) > + `(("ghc-hashable" ,ghc-hashable) > ("ghc-hunit" ,ghc-hunit) > ("ghc-test-framework" ,ghc-test-framework) > ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) > @@ -5083,7 +4951,6 @@ given term should not exist.") > ("ghc-profunctors" ,ghc-profunctors) > ("ghc-semigroups" ,ghc-semigroups) > ("ghc-statevar" ,ghc-statevar) > - ("ghc-stm" ,ghc-stm) > ("ghc-tagged" ,ghc-tagged) > ("ghc-th-abstraction" ,ghc-th-abstraction) > ("ghc-transformers-compat" ,ghc-transformers-compat) > @@ -5175,8 +5042,6 @@ call stacks with different versions of the compiler.") > (base32 > "08r2iw0gdmfs4f6wraaq19vfmkjdbics3dbhw39y7mdjd98kcr7b")))) > (build-system haskell-build-system) > - (inputs > - `(("ghc-stm" ,ghc-stm))) > (home-page "https://hackage.haskell.org/package/StateVar") > (synopsis "State variables for Haskell") > (description "This package provides state variables, which are references > @@ -5217,7 +5082,6 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") > ("ghc-profunctors" ,ghc-profunctors) > ("ghc-semigroups" ,ghc-semigroups) > ("ghc-tagged" ,ghc-tagged) > - ("ghc-text" ,ghc-text) > ("ghc-transformers-compat" ,ghc-transformers-compat) > ("ghc-unordered-containers" ,ghc-unordered-containers) > ("ghc-void" ,ghc-void) > @@ -5258,8 +5122,7 @@ indexed variants.") > "1hiqi7h76shjzs2zj0j8g6wnq2hbiq1hmfafdazr97fba2zl2432")))) > (build-system haskell-build-system) > (inputs > - `(("ghc-text" ,ghc-text) > - ("ghc-blaze-html" ,ghc-blaze-html) > + `(("ghc-blaze-html" ,ghc-blaze-html) > ("ghc-xss-sanitize" ,ghc-xss-sanitize) > ("ghc-data-default" ,ghc-data-default) > ("ghc-syb" ,ghc-syb) > @@ -5393,7 +5256,6 @@ just a @code{Semigroup} are added.") > `(("ghc-nats" ,ghc-nats) > ("ghc-tagged" ,ghc-tagged) > ("ghc-unordered-containers" ,ghc-unordered-containers) > - ("ghc-text" ,ghc-text) > ("ghc-hashable" ,ghc-hashable))) > (home-page "https://github.com/ekmett/semigroups/") > (synopsis "Semigroup operations for Haskell") > @@ -5414,7 +5276,6 @@ semigroup.") > `(("ghc-nats" ,ghc-nats-bootstrap) > ("ghc-tagged" ,ghc-tagged) > ("ghc-unordered-containers" ,ghc-unordered-containers-bootstrap) > - ("ghc-text" ,ghc-text) > ("ghc-hashable" ,ghc-hashable-bootstrap))) > (properties '(hidden? #t)))) > > @@ -5537,7 +5398,6 @@ monad transformer (instead of the IO monad).") > (inputs > `(("ghc-auto-update" ,ghc-auto-update) > ("ghc-easy-file" ,ghc-easy-file) > - ("ghc-text" ,ghc-text) > ("ghc-unix-time" ,ghc-unix-time))) > (native-inputs > `(("hspec-discover" ,hspec-discover) > @@ -5723,7 +5583,6 @@ in migrated modules.") > (build-system haskell-build-system) > (inputs > `(("ghc-integer-logarithms" ,ghc-integer-logarithms) > - ("ghc-text" ,ghc-text) > ("ghc-hashable" ,ghc-hashable) > ("ghc-primitive" ,ghc-primitive))) > (native-inputs > @@ -5750,7 +5609,6 @@ notation}.") > (arguments `(#:tests? #f)) > (inputs > `(("ghc-integer-logarithms" ,ghc-integer-logarithms-bootstrap) > - ("ghc-text" ,ghc-text) > ("ghc-hashable" ,ghc-hashable) > ("ghc-primitive" ,ghc-primitive))) > (native-inputs '()) > @@ -5879,7 +5737,6 @@ building up, manipulating and serialising @code{Pandoc} structures.") > ("ghc-temporary" ,ghc-temporary) > ("ghc-utf8-string" ,ghc-utf8-string) > ("ghc-xml" ,ghc-xml) > - ("ghc-parsec" ,ghc-parsec) > ("ghc-pandoc-types" ,ghc-pandoc-types))) > (home-page "https://github.com/jgm/texmath") > (synopsis "Conversion between formats used to represent mathematics") > @@ -5955,8 +5812,7 @@ and utilities for pretty printing.") > `(("ghc-diff" ,ghc-diff) > ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin))) > (native-inputs > - `(("ghc-parsec" ,ghc-parsec) > - ("ghc-blaze-html" ,ghc-blaze-html) > + `(("ghc-blaze-html" ,ghc-blaze-html) > ("ghc-utf8-string" ,ghc-utf8-string))) > (home-page "https://github.com/jgm/highlighting-kate") > (synopsis "Syntax highlighting library") > @@ -5983,8 +5839,6 @@ descriptions.") > (base32 > "1c1j3a8b9qx5zk9myqm3gap8ymz7fipwrdmyfsq9wkkdr9x4np45")))) > (build-system haskell-build-system) > - (inputs > - `(("ghc-text" ,ghc-text))) > (native-inputs > `(("ghc-hunit" ,ghc-hunit))) > (home-page "https://github.com/jgm/commonmark-hs") > @@ -6010,8 +5864,6 @@ sources, and does not require prior installation of the C library.") > (base32 > "13b0mqks5c1q989slgsa3ixr5vvkfyic4ynzgv00kgl5qrs7hqk7")))) > (build-system haskell-build-system) > - (inputs > - `(("ghc-text" ,ghc-text))) > (native-inputs > `(("ghc-hunit" ,ghc-hunit))) > (home-page "https://github.com/kivikakk/cmark-gfm-hs") > @@ -6168,7 +6020,6 @@ datatypes.") > (inputs > `(("ghc-th-lift" ,ghc-th-lift) > ("ghc-vector" ,ghc-vector) > - ("ghc-text" ,ghc-text) > ("ghc-quickcheck" ,ghc-quickcheck))) > (home-page "https://github.com/bennofs/th-lift-instances/") > (synopsis "Lift instances for template-haskell for common data types.") > @@ -6428,7 +6279,6 @@ back-ends.") > ("ghc-aeson" ,ghc-aeson) > ("ghc-unordered-containers" ,ghc-unordered-containers) > ("ghc-vector" ,ghc-vector) > - ("ghc-text" ,ghc-text) > ("ghc-attoparsec" ,ghc-attoparsec) > ("ghc-scientific" ,ghc-scientific) > ("ghc-semigroups" ,ghc-semigroups) > @@ -6531,8 +6381,7 @@ TIFF and GIF formats.") > (inputs > `(("lua" ,lua) > ("ghc-exceptions" ,ghc-exceptions) > - ("ghc-fail" ,ghc-fail) > - ("ghc-text" ,ghc-text))) > + ("ghc-fail" ,ghc-fail))) > (native-inputs > `(("ghc-tasty" ,ghc-tasty) > ("ghc-tasty-expected-failure" ,ghc-tasty-expected-failure) > @@ -6565,8 +6414,7 @@ described in @url{https://www.lua.org/}.") > `(#:cabal-revision > ("1" "0vajlsd7y6pwa08635q0cx8z5c1c55bk7fvavw7g2vmyvxqjzx6n"))) > (inputs > - `(("ghc-hslua" ,ghc-hslua) > - ("ghc-text" ,ghc-text))) > + `(("ghc-hslua" ,ghc-hslua))) > (native-inputs > `(("ghc-tasty" ,ghc-tasty) > ("ghc-tasty-hunit" ,ghc-tasty-hunit))) > @@ -6764,7 +6612,6 @@ the choice of SSL/TLS, and SOCKS.") > ("ghc-hxt" ,ghc-hxt) > ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin) > ("ghc-safe" ,ghc-safe) > - ("ghc-text" ,ghc-text) > ("ghc-utf8-string" ,ghc-utf8-string))) > (native-inputs > `(("ghc-diff" ,ghc-diff) > @@ -6818,9 +6665,7 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") > `(("ghc-aeson" ,ghc-aeson) > ("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))) > (native-inputs > @@ -6883,7 +6728,6 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") > ("ghc-network-uri" ,ghc-network-uri) > ("ghc-old-locale" ,ghc-old-locale) > ("ghc-pandoc-types" ,ghc-pandoc-types) > - ("ghc-parsec" ,ghc-parsec) > ("ghc-random" ,ghc-random) > ("ghc-scientific" ,ghc-scientific) > ("ghc-sha" ,ghc-sha) > @@ -6893,7 +6737,6 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") > ("ghc-tagsoup" ,ghc-tagsoup) > ("ghc-temporary" ,ghc-temporary) > ("ghc-texmath" ,ghc-texmath) > - ("ghc-text" ,ghc-text) > ("ghc-unordered-containers" ,ghc-unordered-containers) > ("ghc-vector" ,ghc-vector) > ("ghc-xml" ,ghc-xml) > @@ -6981,8 +6824,7 @@ better for some purposes.") > "0j36vrc9w841m5qbwqra1lwiznx31xfnhin1sm8x2c2739csbpn0")))) > (build-system haskell-build-system) > (inputs > - `(("ghc-async" ,ghc-async) > - ("ghc-stm" ,ghc-stm))) > + `(("ghc-async" ,ghc-async))) > (native-inputs > `(("ghc-base64-bytestring" ,ghc-base64-bytestring) > ("ghc-hspec" ,ghc-hspec) > @@ -7014,7 +6856,6 @@ upon it.") > `(("ghc-conduit" ,ghc-conduit) > ("ghc-exceptions" ,ghc-exceptions) > ("ghc-monad-control" ,ghc-monad-control) > - ("ghc-text" ,ghc-text) > ("ghc-transformers-base" ,ghc-transformers-base) > ("ghc-typed-process" ,ghc-typed-process) > ("ghc-async" ,ghc-async) > @@ -7023,7 +6864,6 @@ upon it.") > ("ghc-network" ,ghc-network) > ("ghc-primitive" ,ghc-primitive) > ("ghc-resourcet" ,ghc-resourcet) > - ("ghc-stm" ,ghc-stm) > ("ghc-streaming-commons" ,ghc-streaming-commons) > ("ghc-hspec" ,ghc-hspec) > ("ghc-bytestring-builder" ,ghc-bytestring-builder) > @@ -7053,7 +6893,6 @@ dependencies. The basic idea is that this package should only depend on > (base32 > "1jgqxsa9p2q3h6nymbfmvhldqrqlwrhrzmwadlyc0li50x0d8dwr")))) > (build-system haskell-build-system) > - (inputs `(("ghc-text" ,ghc-text))) > (home-page "https://john-millikin.com/software/haskell-xml/") > (synopsis "Basic types for representing XML") > (description "This package provides basic types for representing XML > @@ -7078,7 +6917,6 @@ documents.") > ("ghc-conduit-extra" ,ghc-conduit-extra) > ("ghc-doctest" ,ghc-doctest) > ("ghc-resourcet" ,ghc-resourcet) > - ("ghc-text" ,ghc-text) > ("ghc-xml-types" ,ghc-xml-types) > ("ghc-attoparsec" ,ghc-attoparsec) > ("ghc-data-default-class" ,ghc-data-default-class) > @@ -7127,7 +6965,6 @@ the @code{conduit} package.") > ("ghc-pandoc" ,ghc-pandoc) > ("ghc-tagsoup" ,ghc-tagsoup) > ("ghc-aeson" ,ghc-aeson) > - ("ghc-text" ,ghc-text) > ("ghc-vector" ,ghc-vector) > ("ghc-xml-conduit" ,ghc-xml-conduit) > ("ghc-unordered-containers" ,ghc-unordered-containers) > @@ -7138,7 +6975,6 @@ the @code{conduit} package.") > ("ghc-hs-bibutils" ,ghc-hs-bibutils) > ("ghc-rfc5051" ,ghc-rfc5051) > ("ghc-syb" ,ghc-syb) > - ("ghc-parsec" ,ghc-parsec) > ("ghc-old-locale" ,ghc-old-locale) > ("ghc-aeson-pretty" ,ghc-aeson-pretty) > ("ghc-attoparsec" ,ghc-attoparsec) > @@ -7262,8 +7098,7 @@ regular expressions. Parsers can be built using Applicative interface.") > "0l7ajnh4hpgggf2a1r9dg0hx2fy679vd2kada5y7r02hy3nfxala")))) > (build-system haskell-build-system) > (inputs > - `(("ghc-parsec" ,ghc-parsec) > - ("ghc-regex-base" ,ghc-regex-base))) > + `(("ghc-regex-base" ,ghc-regex-base))) > (home-page "https://github.com/ChrisKuklewicz/regex-tdfa") > (synopsis "POSIX extended regular expressions in Haskell.") > (description > @@ -7524,8 +7359,7 @@ supported. A module of colour names (\"Data.Colour.Names\") is provided.") > "0g3w92rad6x5appfb22rbzcas2ix2h0hy91sdxhq8a4a5cnlrpa0")))) > (build-system haskell-build-system) > (inputs > - `(("ghc-base-compat" ,ghc-base-compat) > - ("ghc-text" ,ghc-text))) > + `(("ghc-base-compat" ,ghc-base-compat))) > (home-page "https://hackage.haskell.org/package/wl-pprint-text") > (synopsis "Wadler/Leijen Pretty Printer for Text values") > (description > @@ -7589,7 +7423,6 @@ for generating graph-like data structures.") > ("ghc-fgl-arbitrary" ,ghc-fgl-arbitrary) > ("ghc-polyparse" ,ghc-polyparse) > ("ghc-temporary" ,ghc-temporary) > - ("ghc-text" ,ghc-text) > ("ghc-wl-pprint-text" ,ghc-wl-pprint-text))) > (native-inputs > `(("ghc-hspec" ,ghc-hspec) > @@ -7697,8 +7530,7 @@ instance of @code{MonadBase} or @code{MonadBaseControl}.") > (arguments > `(#:tests? #f)) > (inputs > - `(("ghc-text" ,ghc-text) > - ("ghc-quickcheck" ,ghc-quickcheck))) > + `(("ghc-quickcheck" ,ghc-quickcheck))) > (home-page "https://github.com/fpco/haskell-filesystem") > (synopsis "High-level, byte-based file and directory path manipulations") > (description > @@ -7727,7 +7559,6 @@ increasing type safety.") > `(#:tests? #f)) > (inputs > `(("ghc-system-filepath-bootstrap" ,ghc-system-filepath-bootstrap) > - ("ghc-text" ,ghc-text) > ("ghc-temporary" ,ghc-temporary))) > (home-page "https://github.com/fpco/haskell-filesystem") > (synopsis "Consistent file system interaction across GHC versions") > @@ -7762,7 +7593,6 @@ which can't be decoded in the current locale encoding.") > ("ghc-lifted-async" ,ghc-lifted-async) > ("ghc-exceptions" ,ghc-exceptions) > ("ghc-enclosed-exceptions" ,ghc-enclosed-exceptions) > - ("ghc-text" ,ghc-text) > ("ghc-async" ,ghc-async) > ("ghc-transformers-base" ,ghc-transformers-base) > ("ghc-hunit" ,ghc-hunit) > @@ -7819,7 +7649,6 @@ easily work with command-line options.") > `(("ghc-options-bootstrap" ,ghc-options-bootstrap) > ("ghc-patience" ,ghc-patience) > ("ghc-random" ,ghc-random) > - ("ghc-text" ,ghc-text) > ("ghc-ansi-terminal" ,ghc-ansi-terminal))) > (home-page "https://john-millikin.com/software/chell/") > (synopsis "Simple and intuitive library for automated testing") > @@ -7940,8 +7769,7 @@ easily work with command-line options.") > ;; FilePath "/r2\ENQ52\t ;$/o\US=/okG\146\&6\n<u\DC3/5\182\223a\DELN\EOT#\NUL/`[m/\USEKV\ETX([)b6/\ACK\SOo\245\ETBO/f\128\STX`|\EM\"/*\EMA\USD3/\143\&4/\CAN?\SUBee\CANR/9/B0\187Kx4/Vqr\232'b:/\a\234\DLE.\"\179/\ENQ{J/|/G)@^\237/\219ml/\DC3pd\ESC" > (arguments `(#:tests? #f)) > (inputs > - `(("ghc-text" ,ghc-text) > - ("ghc-chell" ,ghc-chell) > + `(("ghc-chell" ,ghc-chell) > ("ghc-chell-quickcheck" ,ghc-chell-quickcheck) > ("ghc-quickcheck" ,ghc-quickcheck))) > (home-page "https://github.com/fpco/haskell-filesystem") > @@ -7968,7 +7796,6 @@ increasing type safety.") > (build-system haskell-build-system) > (inputs > `(("ghc-system-filepath" ,ghc-system-filepath) > - ("ghc-text" ,ghc-text) > ("ghc-chell" ,ghc-chell) > ("ghc-temporary" ,ghc-temporary))) > (home-page "https://github.com/fpco/haskell-filesystem") > @@ -8285,8 +8112,7 @@ accessed or modified.") > "19bdbz9wb9jvln6yg6qm0hz0w84bypvkxf0wjhgrgd52f9gidlny")))) > (build-system haskell-build-system) > (inputs > - `(("ghc-text" ,ghc-text) > - ("ghc-async" ,ghc-async) > + `(("ghc-async" ,ghc-async) > ("ghc-unix-compat" ,ghc-unix-compat) > ("ghc-hinotify" ,ghc-hinotify) > ("ghc-tasty" ,ghc-tasty) > @@ -8518,9 +8344,7 @@ handled safely, this is what you're left with.") > "13kkfgx58z18jphbg56jn08jn72wi3kvfndlwwx87hqwg7x1dfz6")))) > (build-system haskell-build-system) > (inputs > - `(("ghc-syb" ,ghc-syb) > - ("ghc-text" ,ghc-text) > - ("ghc-parsec" ,ghc-parsec))) > + `(("ghc-syb" ,ghc-syb))) > (home-page "https://hackage.haskell.org/package/json") > (synopsis "Serializes Haskell data to and from JSON") > (description "This package provides a parser and pretty printer for > @@ -8578,7 +8402,6 @@ JSON (JavaScript Object Notation) is a lightweight data-interchange format.") > ("ghc-persistent" ,ghc-persistent) > ("ghc-resourcet" ,ghc-resourcet) > ("ghc-tagged" ,ghc-tagged) > - ("ghc-text" ,ghc-text) > ("ghc-unliftio" ,ghc-unliftio) > ("ghc-unordered-containers" ,ghc-unordered-containers))) > (native-inputs > @@ -8612,7 +8435,6 @@ generated SQL and optimize it for your backend.") > (inputs > `(("ghc-aeson" ,ghc-aeson) > ("ghc-quickcheck" ,ghc-quickcheck) > - ("ghc-parsec" ,ghc-parsec) > ("ghc-regex-tdfa" ,ghc-regex-tdfa))) > (home-page "https://github.com/koalaman/shellcheck") > (synopsis "Static analysis for shell scripts") > @@ -8789,7 +8611,6 @@ matching patterns against file paths.") > (build-system haskell-build-system) > (inputs > `(("ghc-exceptions" ,ghc-exceptions) > - ("ghc-text" ,ghc-text) > ("ghc-transformers-compat" ,ghc-transformers-compat) > ("ghc-unexceptionalio" ,ghc-unexceptionalio) > ("ghc-safe" ,ghc-safe))) > @@ -9161,8 +8982,7 @@ and regression and autocorrelation analysis. > "16m7y7fwrirbjbqqcsfmr4yxa9qvfax6r7pw0zl9ky71ms0wa47p")))) > (build-system haskell-build-system) > (inputs `(("ghc-vector" ,ghc-vector) > - ("ghc-semigroups" ,ghc-semigroups) > - ("ghc-text" ,ghc-text))) > + ("ghc-semigroups" ,ghc-semigroups))) > (home-page "https://github.com/snoyberg/mono-traversable") > (synopsis "Typeclasses for dealing with various chunked data > representations for Haskell") > @@ -9375,8 +9195,7 @@ IPv4, IPv6 and MAC addresses.") > (("tasty-hunit == 0\\.9\\.\\*") "tasty-hunit") > (("tasty-quickcheck == 0\\.8\\.\\*") "tasty-quickcheck"))))))) > (inputs `(("ghc-hashable" ,ghc-hashable) > - ("ghc-random" ,ghc-random) > - ("ghc-text" ,ghc-text))) > + ("ghc-random" ,ghc-random))) > (native-inputs `(("ghc-hunit" ,ghc-hunit) > ("ghc-quickcheck" ,ghc-quickcheck) > ("ghc-tasty" ,ghc-tasty) > @@ -9422,7 +9241,6 @@ functions.") > ("ghc-entropy" ,ghc-entropy) > ("ghc-network-info" ,ghc-network-info) > ("ghc-random" ,ghc-random) > - ("ghc-text" ,ghc-text) > ("ghc-uuid-types" ,ghc-uuid-types))) > (native-inputs `(("ghc-hunit" ,ghc-hunit) > ("ghc-quickcheck" ,ghc-quickcheck) > @@ -9449,11 +9267,9 @@ parsing and printing @dfn{Universally Unique Identifiers} or UUIDs.") > (base32 > "1gah2qwfpzwamnikbc5h4nv6dgvv9h16di9ka7946za3nibyasya")))) > (build-system haskell-build-system) > - (inputs `(("ghc-stm" ,ghc-stm) > - ("ghc-hashable" ,ghc-hashable) > + (inputs `(("ghc-hashable" ,ghc-hashable) > ("ghc-vector" ,ghc-vector) > ("ghc-unordered-containers" ,ghc-unordered-containers) > - ("ghc-text" ,ghc-text) > ("ghc-scientific" ,ghc-scientific) > ("ghc-uuid" ,ghc-uuid) > ("ghc-dlist" ,ghc-dlist) > @@ -9566,7 +9382,6 @@ vector. ") > (build-system haskell-build-system) > (inputs `(("ghc-mwc-randam" ,ghc-mwc-random) > ("ghc-primitive" ,ghc-primitive) > - ("ghc-text" ,ghc-text) > ("ghc-vector" ,ghc-vector) > ("ghc-unordered-containers" ,ghc-unordered-containers) > ("ghc-hashable" ,ghc-hashable) > @@ -9600,7 +9415,6 @@ and are often as efficient as hand-written folds.") > (build-system haskell-build-system) > (inputs `(("ghc-unordered-containers" ,ghc-unordered-containers) > ("ghc-hashable" ,ghc-hashable) > - ("ghc-text" ,ghc-text) > ("ghc-vector" ,ghc-vector) > ("ghc-vector-algorithms" ,ghc-vector-algorithms) > ("ghc-split" ,ghc-split))) > @@ -9638,7 +9452,6 @@ data structures as non-empty.") > ("ghc-transformers-base" ,ghc-transformers-base) > ("ghc-primitive" ,ghc-primitive) > ("ghc-vector" ,ghc-vector) > - ("ghc-text" ,ghc-text) > ("ghc-void" ,ghc-void) > ("ghc-mwc-random" ,ghc-mwc-random) > ("ghc-unix-compat" ,ghc-unix-compat) > @@ -9694,7 +9507,6 @@ as well as a convenient Conduit module.") > ("ghc-safe" ,ghc-safe) > ("ghc-scientific" ,ghc-scientific) > ("ghc-tagged" ,ghc-tagged) > - ("ghc-text" ,ghc-text) > ("ghc-unordered-containers" ,ghc-unordered-containers) > ("ghc-utf8-string" ,ghc-utf8-string) > ("ghc-vector" ,ghc-vector) > @@ -9785,7 +9597,6 @@ Foundation has the following goals: > (base32 > "0f27sp09yha43xk9q55sc185jyjs5h7gq2dhsyx6bm9kz9dzqi13")))) > (build-system haskell-build-system) > - (inputs `(("ghc-stm" ,ghc-stm))) > (home-page "https://hackage.haskell.org/package/stm-chans") > (synopsis "Additional types of channels for ghc-stm") > (description "This Haskell package offers a collection of channel types, > @@ -9830,8 +9641,6 @@ operators for looping.") > "1z516s4pa9n94zf0l45mylssg07xr1d1m6zrz900p0iv3vfd07mv")))) > (build-system haskell-build-system) > (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat) > - ("ghc-text" ,ghc-text) > - ("ghc-stm" ,ghc-stm) > ("ghc-stm-chans" ,ghc-stm-chans) > ("ghc-lifted-base" ,ghc-lifted-base) > ("ghc-resourcet" ,ghc-resourcet) > @@ -9866,9 +9675,7 @@ code locations of messages.") > (base32 > "1vk4b19zvwy4mpwaq9z3l3kfmz75gfyf7alhh0y112gspgpccm23")))) > (build-system haskell-build-system) > - (inputs `(("ghc-parsec" ,ghc-parsec) > - ("ghc-text" ,ghc-text) > - ("ghc-aeson" ,ghc-aeson) > + (inputs `(("ghc-aeson" ,ghc-aeson) > ("ghc-blaze-markup" ,ghc-blaze-markup) > ("ghc-blaze-html" ,ghc-blaze-html) > ("ghc-exceptions" ,ghc-exceptions) > @@ -9926,7 +9733,6 @@ a memory chunk that will be auto-scrubbed after it run out of scope.") > (inputs `(("ghc-hashable" ,ghc-hashable) > ("ghc-monad-control" ,ghc-monad-control) > ("ghc-transformers-base" ,ghc-transformers-base) > - ("ghc-stm" ,ghc-stm) > ("ghc-vector" ,ghc-vector))) > (home-page "https://github.com/bos/pool") > (synopsis "Striped resource pooling implementation in Haskell") > @@ -9953,8 +9759,7 @@ connections.") > `(#:cabal-revision > ("1" "06f7pgmmc8456p3hc1y23kz1y127gfczy7s00wz1rls9g2sm2vi4"))) > (inputs `(("ghc-attoparsec" ,ghc-attoparsec) > - ("ghc-base-compat" ,ghc-base-compat) > - ("ghc-text" ,ghc-text))) > + ("ghc-base-compat" ,ghc-base-compat))) > (home-page "https://github.com/bos/aeson") > (synopsis "Parse ISO 8601 dates") > (description "Haskell library for parsing of ISO 8601 dates, originally > @@ -10037,7 +9842,6 @@ parser that uses ByteStrings for parsing and representing the URI data.") > ("ghc-attoparsec-iso8601" ,ghc-attoparsec-iso8601) > ("ghc-hashable" ,ghc-hashable) > ("ghc-http-types" ,ghc-http-types) > - ("ghc-text" ,ghc-text) > ("ghc-time-locale-compat" ,ghc-time-locale-compat) > ("ghc-unordered-containers" ,ghc-unordered-containers) > ("ghc-uri-bytestring" ,ghc-uri-bytestring) > @@ -10064,7 +9868,6 @@ Haskell data types to and from HTTP API data.") > "1h0yijbf1yiwl50klyafy4ln99j8bib4kgbzviw7fc4y4mwv4sv9")))) > (build-system haskell-build-system) > (inputs `(("ghc-old-locale" ,ghc-old-locale) > - ("ghc-text" ,ghc-text) > ("ghc-conduit" ,ghc-conduit) > ("ghc-resourcet" ,ghc-resourcet) > ("ghc-exceptions" ,ghc-exceptions) > @@ -10118,7 +9921,6 @@ way.") > ("ghc-exceptions" ,ghc-exceptions) > ("ghc-hashable" ,ghc-hashable) > ("ghc-scientific" ,ghc-scientific) > - ("ghc-text" ,ghc-text) > ("ghc-time-locale-compat" ,ghc-time-locale-compat) > ("ghc-unordered-containers" ,ghc-unordered-containers) > ("ghc-vector" ,ghc-vector) > @@ -10150,7 +9952,6 @@ ghc-aeson.") > ("2" "03qgwk32krldph3blw5agiqcpccr3649hajyn8wm9k71zz82dpn6"))) > (inputs `(("ghc-persistent" ,ghc-persistent) > ("ghc-monad-control" ,ghc-monad-control) > - ("ghc-text" ,ghc-text) > ("ghc-aeson" ,ghc-aeson) > ("ghc-aeson-compat" ,ghc-aeson-compat) > ("ghc-monad-logger" ,ghc-monad-logger) > @@ -10260,7 +10061,6 @@ used both from lens and microlens).") > (arguments `(#:tests? #f)) ; FIXME: hspec-discover not in PATH > (inputs > `(("ghc-async" ,ghc-async) > - ("ghc-stm" ,ghc-stm) > ("ghc-unliftio-core" ,ghc-unliftio-core))) > (native-inputs `(("ghc-hspec" ,ghc-hspec))) > (home-page "https://github.com/fpco/unliftio") > @@ -10297,8 +10097,7 @@ working with it.") > ("ghc-unordered-containers" ,ghc-unordered-containers))) > (native-inputs `(("ghc-hspec" ,ghc-hspec) > ("ghc-persistent-template" ,ghc-persistent-template) > - ("ghc-temporary" ,ghc-temporary) > - ("ghc-text" ,ghc-text))) > + ("ghc-temporary" ,ghc-temporary))) > (home-page > "https://www.yesodweb.com/book/persistent") > (synopsis "Backend for the persistent library using sqlite3") > @@ -10356,7 +10155,6 @@ address string against RFC 5322.") > ("cabal-doctest" ,cabal-doctest) > ("ghc-doctest" ,ghc-doctest) > ("ghc-scientific" ,ghc-scientific) > - ("ghc-text" ,ghc-text) > ("ghc-transformers-compat" ,ghc-transformers-compat) > ("ghc-unordered-containers" ,ghc-unordered-containers) > ("ghc-void" ,ghc-void) > @@ -10453,7 +10251,6 @@ This package provides an orphan instance.") > (arguments '(#:tests? #f)) > (inputs > `(("ghc-network" ,ghc-network) > - ("ghc-parsec" ,ghc-parsec) > ("ghc-hunit" ,ghc-hunit) > ("ghc-regex-compat" ,ghc-regex-compat) > ("ghc-hslogger" ,ghc-hslogger) > @@ -10632,7 +10429,6 @@ widths to the Char type.") > ("ghc-hashable" ,ghc-hashable) > ("ghc-microlens" ,ghc-microlens) > ("ghc-primitive" ,ghc-primitive) > - ("ghc-text" ,ghc-text) > ("ghc-typed-process" ,ghc-typed-process) > ("ghc-unliftio" ,ghc-unliftio) > ("ghc-unordered-containers" ,ghc-unordered-containers) > @@ -10718,7 +10514,6 @@ expose it from another module in the hierarchy. > #t)))))) > (inputs > `(("ghc-utf8-string" ,ghc-utf8-string) > - ("ghc-text" ,ghc-text) > ("cairo" ,cairo))) > (native-inputs > `(("ghc-gtk2hs-buildtools" ,ghc-gtk2hs-buildtools) > @@ -10775,12 +10570,10 @@ backend for the Charts library.") > (build-system haskell-build-system) > (inputs > `(("ghc-temporary" ,ghc-temporary) > - ("ghc-unix-compat" ,ghc-unix-compat) > - ("ghc-text" ,ghc-text))) > + ("ghc-unix-compat" ,ghc-unix-compat))) > (native-inputs > `(("ghc-temporary" ,ghc-temporary) > ("ghc-unix-compat" ,ghc-unix-compat) > - ("ghc-text" ,ghc-text) > ("ghc-hspec" ,ghc-hspec) > ("hspec-discover" ,hspec-discover))) > (home-page "https://github.com/stackbuilders/atomic-write") > @@ -10865,8 +10658,7 @@ monadic incremental interface is provided as well.") > "0paapljn7nqfzrx889y0n8sszci38mdiaxkgr0bb00ph9246rr7z")))) > (build-system haskell-build-system) > (inputs > - `(("ghc-stm" ,ghc-stm) > - ("ghc-stm-chans" ,ghc-stm-chans) > + `(("ghc-stm-chans" ,ghc-stm-chans) > ("ghc-cereal" ,ghc-cereal) > ("ghc-cereal-conduit" ,ghc-cereal-conduit) > ("ghc-conduit" ,ghc-conduit) > @@ -11021,7 +10813,6 @@ based on a binomial heap.") > ("ghc-monad-control" ,ghc-monad-control) > ("ghc-pqueue" ,ghc-pqueue) > ("ghc-resourcet" ,ghc-resourcet) > - ("ghc-stm" ,ghc-stm) > ("ghc-stm-conduit" ,ghc-stm-conduit) > ("ghc-streaming-commons" ,ghc-streaming-commons) > ("ghc-unliftio-core" ,ghc-unliftio-core) > @@ -11058,7 +10849,6 @@ level asynchronous processing and some other utilities.") > ("ghc-hspec" ,ghc-hspec) > ("ghc-quickcheck" ,ghc-quickcheck) > ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) > - ("ghc-text" ,ghc-text) > ("hspec-discover" ,hspec-discover))) > (home-page "https://github.com/sol/interpolate") > (synopsis "String interpolation library") > @@ -11088,7 +10878,6 @@ Haskell.") > ("ghc-http-client-tls" ,ghc-http-client-tls) > ("ghc-http-types" ,ghc-http-types) > ("ghc-scientific" ,ghc-scientific) > - ("ghc-text" ,ghc-text) > ("ghc-unordered-containers" ,ghc-unordered-containers) > ("ghc-vector" ,ghc-vector) > ("ghc-yaml" ,ghc-yaml))) > @@ -11153,7 +10942,6 @@ DOS/Windows paths and markup languages (such as XML).") > `(("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) > ("ghc-cryptohash" ,ghc-cryptohash) > ("ghc-hashable" ,ghc-hashable) > - ("ghc-parsec" ,ghc-parsec) > ("ghc-parsers" ,ghc-parsers) > ("ghc-unordered-containers" ,ghc-unordered-containers) > ("ghc-vector" ,ghc-vector))) > @@ -11332,7 +11120,6 @@ from strict or lazy bytestrings.") > (inputs > `(("ghc-attoparsec" ,ghc-attoparsec) > ("ghc-hashable" ,ghc-hashable) > - ("ghc-text" ,ghc-text) > ("ghc-unix-compat" ,ghc-unix-compat) > ("ghc-unordered-containers" ,ghc-unordered-containers))) > (native-inputs > @@ -11463,7 +11250,6 @@ man pages with practical examples.") > ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) > ("ghc-hunit" ,ghc-hunit) > ("ghc-shelly" ,ghc-shelly) > - ("ghc-text" ,ghc-text) > ("gcc" ,gcc))) > (arguments > `(;; XXX: Test failures are induced by a parse error in <bits/floatn.h> > @@ -11516,7 +11302,6 @@ imported with the correct Haskell types.") > (inputs > `(("ghc-attoparsec" ,ghc-attoparsec) > ("ghc-old-locale" ,ghc-old-locale) > - ("ghc-text" ,ghc-text) > ("ghc-data-default-class" ,ghc-data-default-class) > ("ghc-network" ,ghc-network) > ("ghc-utf8-string" ,ghc-utf8-string))) > @@ -11710,7 +11495,6 @@ example of, \"An applicative functor that is not a monad.\"") > (build-system haskell-build-system) > (inputs > `(("ghc-async" ,ghc-async) > - ("ghc-stm" ,ghc-stm) > ("ghc-exceptions" ,ghc-exceptions) > ("ghc-ansi-terminal" ,ghc-ansi-terminal) > ("ghc-terminal-size" ,ghc-terminal-size))) > diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm > index ec3eb15d63..4290d8c21f 100644 > --- a/gnu/packages/idris.scm > +++ b/gnu/packages/idris.scm > @@ -78,7 +78,6 @@ > ("ghc-safe" ,ghc-safe) > ("ghc-split" ,ghc-split) > ("ghc-terminal-size" ,ghc-terminal-size) > - ("ghc-text" ,ghc-text) > ("ghc-uniplate" ,ghc-uniplate) > ("ghc-unordered-containers" ,ghc-unordered-containers) > ("ghc-utf8-string" ,ghc-utf8-string) > diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm > index 90bc7fc883..a1ad7ac99b 100644 > --- a/gnu/packages/wm.scm > +++ b/gnu/packages/wm.scm > @@ -596,10 +596,8 @@ tiled on several screens.") > `(("ghc-hinotify" ,ghc-hinotify) > ("ghc-http" ,ghc-http) > ("ghc-iwlib" ,ghc-iwlib) > - ("ghc-parsec" ,ghc-parsec) > ("ghc-parsec-numbers" ,ghc-parsec-numbers) > ("ghc-regex-compat" ,ghc-regex-compat) > - ("ghc-stm" ,ghc-stm) > ("ghc-x11-xft" ,ghc-x11-xft) > ("libxpm" ,libxpm))) > (arguments > -- > 2.20.1 (Apple Git-117) > ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] gnu: Remove ghc-parsec, ghc-stm, ghc-text, ghc-xhtml. 2019-07-04 7:57 ` [bug#36493] [PATCH 2/2] gnu: Remove ghc-parsec, ghc-stm, ghc-text, ghc-xhtml Robert Vollmert 2019-07-04 8:04 ` Robert Vollmert @ 2019-07-04 8:15 ` Robert Vollmert 2019-07-04 11:28 ` Ricardo Wurmus 1 sibling, 1 reply; 10+ messages in thread From: Robert Vollmert @ 2019-07-04 8:15 UTC (permalink / raw) To: guix-devel; +Cc: 36493 Hi, I’d like to ask someone to look at and ideally apply these patches. I’ve just updated and rebundled them to fix the haskell packages that were added to Guix in the meantime (original patch from Jun 1: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=36038). Consensus last time this was discussed was that we should implicitly depend on the GHC-included packages instead of re-packaging them: https://lists.gnu.org/archive/html/guix-patches/2019-06/msg00000.html Cheers Robert > On 4. Jul 2019, at 09:57, Robert Vollmert <rob@vllmrt.net> wrote: > > 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,bioinformatics,haskell,haskell-apps,haskell-check, > haskell-crypto,haskell-web,idris,wm}.scm: Remove dependencies on > ghc-parsec, ghc-stm and ghc-text. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] gnu: Remove ghc-parsec, ghc-stm, ghc-text, ghc-xhtml. 2019-07-04 8:15 ` Robert Vollmert @ 2019-07-04 11:28 ` Ricardo Wurmus 2019-07-04 15:45 ` bug#36493: " Ricardo Wurmus 2019-07-05 11:38 ` [bug#36493] " Robert Vollmert 0 siblings, 2 replies; 10+ messages in thread From: Ricardo Wurmus @ 2019-07-04 11:28 UTC (permalink / raw) To: Robert Vollmert; +Cc: guix-devel, 36493 Hi Robert, > I’ve just updated and rebundled them to fix the haskell packages > that were added to Guix in the meantime (original patch from Jun 1: > https://debbugs.gnu.org/cgi/bugreport.cgi?bug=36038). thank you for these patches. They look good to me. I’ll apply them in a moment. > Consensus last time this was discussed was that we should implicitly > depend on the GHC-included packages instead of re-packaging them: > > https://lists.gnu.org/archive/html/guix-patches/2019-06/msg00000.html I’m having second thoughts about this consensus, because I remembered what I did for R. R comes with a bunch of “recommended packages” and they are required to run the test suite. But instead of having the R package include all of these “recommended packages” I created “r-minimal” and one package for each of these otherwise included modules. In R applications and libraries I added packages as needed, even if they were part of the “recommended packages”. This was possible because we used “r-minimal” in the build system. Is something like this at all possible for GHC? Can we force GHC to ignore modules it includes or remove them all together? It would be more elegant if Guix packages for Haskell applications each had a comprehensive “inputs” field without having to rely on any implicitly included libraries. -- Ricardo ^ permalink raw reply [flat|nested] 10+ messages in thread
* bug#36493: [PATCH 2/2] gnu: Remove ghc-parsec, ghc-stm, ghc-text, ghc-xhtml. 2019-07-04 11:28 ` Ricardo Wurmus @ 2019-07-04 15:45 ` Ricardo Wurmus 2019-07-05 11:38 ` [bug#36493] " Robert Vollmert 1 sibling, 0 replies; 10+ messages in thread From: Ricardo Wurmus @ 2019-07-04 15:45 UTC (permalink / raw) To: Robert Vollmert; +Cc: 36493-done Hi Robert, I pushed these both to core-updates after modifications to the commit message. Thanks! -- Ricardo ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] gnu: Remove ghc-parsec, ghc-stm, ghc-text, ghc-xhtml. 2019-07-04 11:28 ` Ricardo Wurmus @ 2019-07-05 11:38 ` Robert Vollmert 2019-07-05 11:38 ` [bug#36493] " Robert Vollmert 1 sibling, 0 replies; 10+ messages in thread From: Robert Vollmert @ 2019-07-05 11:38 UTC (permalink / raw) To: Ricardo Wurmus; +Cc: guix-devel, 36493 > On 4. Jul 2019, at 13:28, Ricardo Wurmus <rekado@elephly.net> wrote: > > > Hi Robert, > >> I’ve just updated and rebundled them to fix the haskell packages >> that were added to Guix in the meantime (original patch from Jun 1: >> https://debbugs.gnu.org/cgi/bugreport.cgi?bug=36038). > > thank you for these patches. They look good to me. I’ll apply them in > a moment. Thank you! >> Consensus last time this was discussed was that we should implicitly >> depend on the GHC-included packages instead of re-packaging them: >> >> https://lists.gnu.org/archive/html/guix-patches/2019-06/msg00000.html > > I’m having second thoughts about this consensus, because I remembered > what I did for R. R comes with a bunch of “recommended packages” and > they are required to run the test suite. But instead of having the R > package include all of these “recommended packages” I created > “r-minimal” and one package for each of these otherwise included > modules. > > In R applications and libraries I added packages as needed, even if they > were part of the “recommended packages”. This was possible because we > used “r-minimal” in the build system. > > Is something like this at all possible for GHC? Can we force GHC to > ignore modules it includes or remove them all together? It would be > more elegant if Guix packages for Haskell applications each had a > comprehensive “inputs” field without having to rely on any implicitly > included libraries. I’m pretty sure it’s somehow possible, but I understand the internals of the haskell build system and GHC’s package database too poorly to be able to say how. Could we do something in guix like what nixpkgs does, where the dependencies are encoded, but then “nulled” depending on the compiler version? https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix#L10 Cheers Robert ^ permalink raw reply [flat|nested] 10+ messages in thread
* [bug#36493] [PATCH 2/2] gnu: Remove ghc-parsec, ghc-stm, ghc-text, ghc-xhtml. @ 2019-07-05 11:38 ` Robert Vollmert 0 siblings, 0 replies; 10+ messages in thread From: Robert Vollmert @ 2019-07-05 11:38 UTC (permalink / raw) To: Ricardo Wurmus; +Cc: guix-devel, 36493 > On 4. Jul 2019, at 13:28, Ricardo Wurmus <rekado@elephly.net> wrote: > > > Hi Robert, > >> I’ve just updated and rebundled them to fix the haskell packages >> that were added to Guix in the meantime (original patch from Jun 1: >> https://debbugs.gnu.org/cgi/bugreport.cgi?bug=36038). > > thank you for these patches. They look good to me. I’ll apply them in > a moment. Thank you! >> Consensus last time this was discussed was that we should implicitly >> depend on the GHC-included packages instead of re-packaging them: >> >> https://lists.gnu.org/archive/html/guix-patches/2019-06/msg00000.html > > I’m having second thoughts about this consensus, because I remembered > what I did for R. R comes with a bunch of “recommended packages” and > they are required to run the test suite. But instead of having the R > package include all of these “recommended packages” I created > “r-minimal” and one package for each of these otherwise included > modules. > > In R applications and libraries I added packages as needed, even if they > were part of the “recommended packages”. This was possible because we > used “r-minimal” in the build system. > > Is something like this at all possible for GHC? Can we force GHC to > ignore modules it includes or remove them all together? It would be > more elegant if Guix packages for Haskell applications each had a > comprehensive “inputs” field without having to rely on any implicitly > included libraries. I’m pretty sure it’s somehow possible, but I understand the internals of the haskell build system and GHC’s package database too poorly to be able to say how. Could we do something in guix like what nixpkgs does, where the dependencies are encoded, but then “nulled” depending on the compiler version? https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix#L10 Cheers Robert ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] gnu: Remove ghc-parsec, ghc-stm, ghc-text, ghc-xhtml. 2019-07-05 11:38 ` [bug#36493] " Robert Vollmert (?) @ 2019-07-06 8:21 ` Ricardo Wurmus -1 siblings, 0 replies; 10+ messages in thread From: Ricardo Wurmus @ 2019-07-06 8:21 UTC (permalink / raw) To: Robert Vollmert; +Cc: guix-devel, 36493 Hi Robert, > Could we do something in guix like what nixpkgs does, where the dependencies > are encoded, but then “nulled” depending on the compiler version? > > https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix#L10 Yes, we could do this in the haskell-build-system (automatically removing inputs before the build is set up). My first reaction was “this is inelegant”, but it does have some advantages: we could rebuild packages with other versions of GHC more easily and it would just work without having to adjust the inputs manually. I think this would be done in guix/build-system/haskell.scm, the “haskell-build” procedure. There we pass all inputs unchanged through to build-expression->derivation. I guess we could filter inputs right there. -- Ricardo ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2019-07-06 8:22 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-07-04 7:55 [bug#36493] update GHC-included haskell dependencies Robert Vollmert 2019-07-04 7:57 ` [bug#36493] [PATCH 1/2] import: hackage: Update list of ghc-included packages Robert Vollmert 2019-07-04 7:57 ` [bug#36493] [PATCH 2/2] gnu: Remove ghc-parsec, ghc-stm, ghc-text, ghc-xhtml Robert Vollmert 2019-07-04 8:04 ` Robert Vollmert 2019-07-04 8:15 ` Robert Vollmert 2019-07-04 11:28 ` Ricardo Wurmus 2019-07-04 15:45 ` bug#36493: " Ricardo Wurmus 2019-07-05 11:38 ` Robert Vollmert 2019-07-05 11:38 ` [bug#36493] " Robert Vollmert 2019-07-06 8:21 ` Ricardo Wurmus
Code repositories for project(s) associated with this external index https://git.savannah.gnu.org/cgit/guix.git This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.