From f54f04756f6d90c9fb3b5e45f3947329287f9b05 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 17:08:08 -0400 Subject: gnu: ghc-mtl: Remove built-in Haskell package. * gnu/packages/agda.scm (agda)[inputs]: Remove ghc-mtl. * gnu/packages/games.scm (raincat)[inputs]: Remove ghc-mtl. * gnu/packages/haskell-check.scm (ghc-tasty-ant-xml, ghc-tasty-golden, ghc-tasty, ghc-tasty-kat, ghc-tasty-rerun, ghc-crypto-cipher-tests)[inputs]: Remove ghc-mtl. * gnu/packages/haskell-crypto.scm (ghc-asn1-encoding, ghc-pem, ghc-x509, ghc-x509-store, ghc-x509-validation, ghc-x509-system)[inputs]: Remove ghc-mtl. * gnu/packages/haskell-web.scm (ghc-http, ghc-http-conduit, ghc-yesod-core)[inputs]: Remove ghc-mtl. * gnu/packages/haskell.scm (ghc-convertible, ghc-libxml, ghc-cgi, ghc-happy, ghc-haskell-src-exts, ghc-resourcet, cabal-install, ghc-indents, ghc-regex-base, ghc-regex-tdfa-rc, ghc-trifecta, ghc-zip-archive, ghc-logict, ghc-exceptions, ghc-smallcheck, ghc-syb, ghc-fgl, ghc-chasingbottoms, ghc-parsec, ghc-megaparsec, ghc-edisonapi, ghc-edisoncore, ghc-mmorph, ghc-ifelse, ghc-kan-extensions, ghc-lens, ghc-cheapskate, ghc-free, ghc-adjunctions, ghc-equivalence, ghc-texmath, ghc-texmath-for-pandoc-1, ghc-highlighting-kate, ghc-th-reify-many, ghc-th-orphans, ghc-geniplate-mirror, ghc-conduit, ghc-filemanip, ghc-juicypixels, ghc-hslua, ghc-hourglass, ghc-skylighting, ghc-skylighting-for-pandoc-1, ghc-pandoc, ghc-pandoc-1, ghc-pandoc-citeproc, ghc-regex-tdfa, ghc-stmonadtrans, ghc-constraints, ghc-lifted-async, ghc-shelly, ghc-hslogger, ghc-json, shellcheck, ghc-vector-algorithms, ghc-monad-par-extras, ghc-monad-par, ghc-monadrandom, ghc-either, ghc-rebase, ghc-aws, ghc-monad-logger, ghc-persistent, ghc-bytes, ghc-missingh, ghc-operational, ghc-chart)[inputs]: Remove ghc-mtl. (ghc-conduit-combinators)[native-inputs]: Remove ghc-mtl. (ghc-mtl): Remove variable. * gnu/packages/idris.scm (idris)[inputs]: Remove ghc-mtl. * gnu/packages/tls.scm (ghc-tls)[inputs]: Remove ghc-mtl. * gnu/packages/version-control.scm (darcs, git-annex)[inputs]: Remove ghc-mtl. * gnu/packages/wm.scm (xmonad, ghc-xmonad-contrib)[inputs]: Remove ghc-mtl. * gnu/packages/xml.scm (ghc-hxt)[inputs]: Remove ghc-mtl. --- gnu/packages/haskell-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index a043ffcc0d..9ef9486b3f 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -171,7 +171,6 @@ both client and server code).") ("ghc-old-time" ,ghc-old-time) ("ghc-parsec" ,ghc-parsec) ("ghc-puremd5" ,ghc-puremd5) - ("ghc-mtl" ,ghc-mtl) ("ghc-network" ,ghc-network) ("ghc-network-uri" ,ghc-network-uri) ("ghc-split" ,ghc-split))) @@ -350,7 +349,6 @@ and HPACK. Currently HTTP/2 16 framing and HPACK 10 is supported.") ("ghc-http-client" ,ghc-http-client) ("ghc-http-client-tls" ,ghc-http-client-tls) ("ghc-monad-control" ,ghc-monad-control) - ("ghc-mtl" ,ghc-mtl) ("ghc-exceptions" ,ghc-exceptions) ("ghc-unliftio" ,ghc-unliftio))) (native-inputs @@ -1039,7 +1037,6 @@ avoid any issues with characters.") ("ghc-text" ,ghc-text) ("ghc-shakespeare" ,ghc-shakespeare) ("ghc-blaze-builder" ,ghc-blaze-builder) - ("ghc-mtl" ,ghc-mtl) ("ghc-clientsession" ,ghc-clientsession) ("ghc-random" ,ghc-random) ("ghc-cereal" ,ghc-cereal) -- cgit v1.2.3 From 6c76f51f96737d5e0fc2148343b4f5605a6e95a4 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 21:21:29 -0400 Subject: gnu: ghc-xhtml: Update to 3000.2.2.1. * gnu/packages/haskell-web.scm (ghc-xhtml): Update to 3000.2.2.1. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 9ef9486b3f..0a53136f97 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -708,7 +708,7 @@ documents.") (define-public ghc-xhtml (package (name "ghc-xhtml") - (version "3000.2.1") + (version "3000.2.2.1") (source (origin (method url-fetch) @@ -718,7 +718,7 @@ documents.") ".tar.gz")) (sha256 (base32 - "1n6wgzxbj8xf0wf1il827qidphnffb5vzhwzqlxhh70c2y10f0ik")))) + "0939kwpinq6l4n3nyvd1gzyl7f83gymw0wzqndlgy1yc7q0nkj2w")))) (build-system haskell-build-system) (home-page "https://github.com/haskell/xhtml") (synopsis "XHTML combinator library") -- cgit v1.2.3 From e95cc1087a13ab4c26244c31b7e6512c37042a5b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Mon, 3 Sep 2018 09:53:24 -0400 Subject: gnu: Add ghc-bsb-http-chunked. * gnu/packages/haskell-web.scm (ghc-bsb-http-chunked): New variable. --- gnu/packages/haskell-web.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 0a53136f97..190bec8dd2 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -524,6 +524,30 @@ functionality.") Haskell's Web Application Interface (WAI).") (license license:expat))) +(define-public ghc-bsb-http-chunked + (package + (name "ghc-bsb-http-chunked") + (version "0.0.0.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/" + "bsb-http-chunked/bsb-http-chunked-" + version ".tar.gz")) + (sha256 + (base32 + "1x6m6xkrcw6jiaig1bb2wb5pqyw31x8xr9k9pxgq2g3ng44pbjr8")))) + (build-system haskell-build-system) + (inputs + `(("ghc-bytestring-builder" ,ghc-bytestring-builder))) + (home-page "http://github.com/sjakobi/bsb-http-chunked") + (synopsis "Chunked HTTP transfer encoding for bytestring builders") + (description "This Haskell library contains functions for encoding +bytestring builders for chunked Hypertext Transfer Protocol (HTTP) 1.1 +transfers.") + (license license:bsd-3))) + (define-public ghc-warp (package (name "ghc-warp") -- cgit v1.2.3 From 8d75edc01055712004598d66d6d5875e31ff61a8 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:13:30 -0400 Subject: gnu: ghc-mime-types: Update to 0.1.0.8. * gnu/packages/haskell-web.scm (ghc-mime-types): Update to 0.1.0.8. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 190bec8dd2..54eedf5044 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -688,7 +688,7 @@ Haskell.") (define-public ghc-mime-types (package (name "ghc-mime-types") - (version "0.1.0.7") + (version "0.1.0.8") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -696,7 +696,7 @@ Haskell.") version ".tar.gz")) (sha256 (base32 - "1fg9cqpp5lswk8ajlq4f41n12c2v2naz179l8dsz6zisjqj4l5l3")))) + "14ccl2842ya17zyj0bpc7vzklbyqvvydpbypn69h2fmhgji192x8")))) (build-system haskell-build-system) (inputs `(("ghc-text" ,ghc-text))) -- cgit v1.2.3 From 4729cfacebe95de6283a4e9efca319f3af400991 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 22:33:13 -0400 Subject: gnu: ghc-multipart: Update to 0.1.3. * gnu/packages/haskell-web.scm (ghc-multipart): Update to 0.1.3. [inputs]: Add ghc-stringsearch. --- gnu/packages/haskell-web.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 54eedf5044..bb4f419e66 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -911,7 +911,7 @@ of a JSON value into a @code{Data.Aeson.Value}.") (define-public ghc-multipart (package (name "ghc-multipart") - (version "0.1.2") + (version "0.1.3") (source (origin (method url-fetch) @@ -921,9 +921,11 @@ of a JSON value into a @code{Data.Aeson.Value}.") ".tar.gz")) (sha256 (base32 - "0g04jhyw1ib1s7c9bcldyyn4n90qd9x7dmvic4vgq57bgcqgnhz5")))) + "1x4n4yyva22dhfr1pg5ki112qvvzb4hyd7bwpm189iq4gcp52q4z")))) (build-system haskell-build-system) - (inputs `(("ghc-parsec" ,ghc-parsec))) + (inputs + `(("ghc-parsec" ,ghc-parsec) + ("ghc-stringsearch" ,ghc-stringsearch))) (home-page "http://www.github.com/silkapp/multipart") (synopsis -- cgit v1.2.3 From 083c9c73757c97afc1e3cdbeb200c2ab1dc33547 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:32:33 -0400 Subject: gnu: ghc-cookie: Update to 0.4.4. * gnu/packages/haskell-web.scm (ghc-cookie): Update to 0.4.4. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index bb4f419e66..72defb3446 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -64,7 +64,7 @@ for screen-scraping.") (define-public ghc-cookie (package (name "ghc-cookie") - (version "0.4.3") + (version "0.4.4") (source (origin (method url-fetch) @@ -74,7 +74,7 @@ for screen-scraping.") ".tar.gz")) (sha256 (base32 - "0qpdydhb9gw590ffabqg70x7xvjpg8l74idqnrfbhv5yrr7hryzv")))) + "1qy09i0jh2z9i9avy2khf8a8afq4fqgnv0fyrszgfg4kmq2fsi9j")))) (build-system haskell-build-system) (inputs `(("ghc-old-locale" ,ghc-old-locale) -- cgit v1.2.3 From b8afa2da58bb04ea5ac021547601e956341f814e Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 23:39:02 -0400 Subject: gnu: ghc-blaze-html: Update to 0.9.1.1. * gnu/packages/haskell-web.scm (ghc-blaze-html): Update to 0.9.1.1. [arguments]: Remove unneeded "--allow-newer" configure flags. --- gnu/packages/haskell-web.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 72defb3446..a60bf007af 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -754,7 +754,7 @@ Strict, Transitional and Frameset variants.") (define-public ghc-blaze-html (package (name "ghc-blaze-html") - (version "0.9.0.1") + (version "0.9.1.1") (source (origin (method url-fetch) @@ -763,11 +763,8 @@ Strict, Transitional and Frameset variants.") version ".tar.gz")) (sha256 (base32 - "0r0acv47nh75bmf7kjyfvhcwz8f02rn9x0a1l80pzgyczfrsmkmf")))) + "06xv8fqhclfjj61z74cgggn4lmx1s7diakxg84mnkgfvk11983pa")))) (build-system haskell-build-system) - (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck" - "--allow-newer=HUnit"))) (inputs `(("ghc-blaze-builder" ,ghc-blaze-builder) ("ghc-text" ,ghc-text) -- cgit v1.2.3 From 2dbecb3a7515eb50e54c431d9830ca7a30d42af1 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:38:09 -0400 Subject: gnu: ghc-aeson: Update to 1.3.1.1. * gnu/packages/haskell-web.scm (ghc-aeson): Update to 1.3.1.1. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index a60bf007af..2e863965ae 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -783,7 +783,7 @@ Strict, Transitional and Frameset variants.") (define-public ghc-aeson (package (name "ghc-aeson") - (version "1.2.4.0") + (version "1.3.1.1") (source (origin (method url-fetch) @@ -793,7 +793,7 @@ Strict, Transitional and Frameset variants.") ".tar.gz")) (sha256 (base32 - "16zwpd07cmhs58wwsqbhxy3b58gqw8w5nr7nf6lwi4nvznjdn09l")))) + "1i1ig840fvsb1lnklcv32zsc0zscirc301lw1mpfxhc6h4pk0gw4")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing. (inputs -- cgit v1.2.3 From 40e1af35bee20984563a4bf48810777d4b7c488b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:41:19 -0400 Subject: gnu: ghc-http-date: Update to 0.0.8. * gnu/packages/haskell-web.scm (ghc-http-date): Update to 0.0.8. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 2e863965ae..742d3abcba 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -261,7 +261,7 @@ libraries, such as http-conduit.") (define-public ghc-http-date (package (name "ghc-http-date") - (version "0.0.6.1") + (version "0.0.8") (source (origin (method url-fetch) @@ -270,7 +270,7 @@ libraries, such as http-conduit.") "http-date-" version ".tar.gz")) (sha256 (base32 - "0dknh28kyarnzqrsc80ssalxjrq0qbv7ir49247p2grb7rh0dqgj")))) + "09slbzqayjnqqz9zybk7slgzvizgplikqgg4b2flzgks91466k0g")))) (build-system haskell-build-system) (inputs `(("ghc-attoparsec" ,ghc-attoparsec))) -- cgit v1.2.3 From d1d27a67bbb9d8e790cc411067daba7a737fe8fe Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:45:20 -0400 Subject: gnu: ghc-aeson-pretty: Update to 0.8.7. * gnu/packages/haskell-web.scm (ghc-aeson-pretty): Update to 0.8.7. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 742d3abcba..4c29964e67 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -842,7 +842,7 @@ naming: in Greek mythology, Aeson was the father of Jason.)") (define-public ghc-aeson-pretty (package (name "ghc-aeson-pretty") - (version "0.8.5") + (version "0.8.7") (source (origin (method url-fetch) (uri (string-append @@ -850,7 +850,7 @@ naming: in Greek mythology, Aeson was the father of Jason.)") version ".tar.gz")) (sha256 (base32 - "1yd98972srlbkn0f2jhrb3f443j9wnq2fnw5gbxjxzmkcinfh5yx")))) + "1m977gs0s9gf3lwzlbs5y7bl6ansc5pywmn2qjk09l5bwg2yrhf1")))) (build-system haskell-build-system) (inputs `(("ghc-aeson" ,ghc-aeson) -- cgit v1.2.3 From aac78f6be3ae6dc3531ce198021fe58ff86f8528 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 4 Sep 2018 00:09:27 -0400 Subject: gnu: Add ghc-tls-session-manager. * gnu/packages/haskell-web.scm (ghc-tls-session-manager): New variable. --- gnu/packages/haskell-web.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 4c29964e67..5278cb9259 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -600,6 +600,32 @@ transfers.") based WAI (Web Application Interface in Haskell).") (license license:expat))) +(define-public ghc-tls-session-manager + (package + (name "ghc-tls-session-manager") + (version "0.0.0.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/" + "tls-session-manager/tls-session-manager-" + version ".tar.gz")) + (sha256 + (base32 + "0rvmln545vghsx8zhxp44f0f6pzma8cylarmfhhysy55ipywr1n5")))) + (build-system haskell-build-system) + (inputs + `(("ghc-auto-update" ,ghc-auto-update) + ("ghc-clock" ,ghc-clock) + ("ghc-psqueues" ,ghc-psqueues) + ("ghc-tls" ,ghc-tls))) + (home-page "http://hackage.haskell.org/package/tls-session-manager") + (synopsis "In-memory TLS session manager") + (description "This Haskell library provides a TLS session manager with +limitation, automatic pruning, energy saving and replay resistance.") + (license license:bsd-3))) + (define-public ghc-warp-tls (package (name "ghc-warp-tls") -- cgit v1.2.3 From 3f135acc357871fabde46ea9eedcf2153b3f4244 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:54:11 -0400 Subject: gnu: ghc-xss-sanitize: Update to 0.3.6. * gnu/packages/haskell-web.scm (ghc-xss-sanitize): Update to 0.3.6. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 5278cb9259..ac7420c981 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -657,7 +657,7 @@ a WAI handler, via the native Haskell TLS implementation.") (define-public ghc-xss-sanitize (package (name "ghc-xss-sanitize") - (version "0.3.5.7") + (version "0.3.6") (source (origin (method url-fetch) @@ -666,7 +666,7 @@ a WAI handler, via the native Haskell TLS implementation.") version ".tar.gz")) (sha256 (base32 - "005cmhaw9xbzkcn42jmhvcvk63bzmg4lml368xwmqdvh7r0mcn4m")))) + "1d72s3a6520iwwc1wbn9v2znqgbw6a5wwzb23iq8ny9ccnjyx1dk")))) (build-system haskell-build-system) (inputs `(("ghc-tagsoup" ,ghc-tagsoup) -- cgit v1.2.3 From 89d44801696f6d0b5458d30e77412f72a637e61d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:55:31 -0400 Subject: gnu: ghc-http-client-tls: Update to 0.3.5.3. * gnu/packages/haskell-web.scm (ghc-http-client-tls): Update to 0.3.5.3. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index ac7420c981..ac8df3921c 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -229,7 +229,7 @@ for more user-friendly packages.") (define-public ghc-http-client-tls (package (name "ghc-http-client-tls") - (version "0.3.5.1") + (version "0.3.5.3") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -237,7 +237,7 @@ for more user-friendly packages.") version ".tar.gz")) (sha256 (base32 - "0n4mi8z77qaggfyq17z79cl304nf1f4h6gag60v4wjwghvmj7yn1")))) + "0qj3pcpgbsfsc4m52dz35khhl4hf1i0nmcpa445z82d9567vy6j7")))) (build-system haskell-build-system) ;; Tests require Internet access (arguments `(#:tests? #f)) -- cgit v1.2.3 From 19da4c3cd99b338333e0d13a05795cf9597393c7 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:53:50 -0400 Subject: gnu: ghc-wai: Update to 3.2.1.2. * gnu/packages/haskell-web.scm (ghc-wai): Update to 3.2.1.2. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index ac8df3921c..a6df96fc46 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -385,7 +385,7 @@ which allow you to avoid direct usage of conduits.") (define-public ghc-wai (package (name "ghc-wai") - (version "3.2.1.1") + (version "3.2.1.2") (source (origin (method url-fetch) @@ -395,7 +395,7 @@ which allow you to avoid direct usage of conduits.") ".tar.gz")) (sha256 (base32 - "08afasnirja21vr0bmzcywz4w29x736dmdv7h8nnh1l8bn7sd02x")))) + "0jr3b2789wa4m6mxkz12ynz4lfsqmgbrcy0am8karyqr3x3528r8")))) (build-system haskell-build-system) (inputs `(("ghc-bytestring-builder" ,ghc-bytestring-builder) -- cgit v1.2.3 From 7b19f0a8030b9f7d9606a9908bb59284aabeca3b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:56:47 -0400 Subject: gnu: ghc-wai-logger: Update to 2.3.2. * gnu/packages/haskell-web.scm (ghc-wai-logger): Update to 2.3.2. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index a6df96fc46..5300a5701a 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -420,7 +420,7 @@ communication between web applications and web servers.") (define-public ghc-wai-logger (package (name "ghc-wai-logger") - (version "2.3.0") + (version "2.3.2") (source (origin (method url-fetch) @@ -430,7 +430,7 @@ communication between web applications and web servers.") ".tar.gz")) (sha256 (base32 - "1w0b0vinsyqr37wciljkz8g5dcmfi2r210lq194a0wkycly9kkch")))) + "0w5ldq4gplc16zzk5ikmbbjw79imaqvw8p6lylaw3hlsbn3zzm4d")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Tests cannot find libraries exported ; by propagated-inputs. -- cgit v1.2.3 From 6369346e5427ea506be15d1b3fa2fed4ac27659d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 00:59:53 -0400 Subject: gnu: ghc-wai-extra: Update to 3.0.24.2. * gnu/packages/haskell-web.scm (ghc-wai-extra): Update to 3.0.24.2. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 5300a5701a..10bcbd2899 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -453,7 +453,7 @@ communication between web applications and web servers.") (define-public ghc-wai-extra (package (name "ghc-wai-extra") - (version "3.0.18") + (version "3.0.24.2") (source (origin (method url-fetch) @@ -463,7 +463,7 @@ communication between web applications and web servers.") ".tar.gz")) (sha256 (base32 - "0r079mqqdv14fp97w0rigdpwk6b88grpjlqsjc5y8bbc0skf5za2")))) + "07gcgq59dki5drkjci9ka34xjsy3bqilbsx0lsc4905w9jlyfbci")))) (build-system haskell-build-system) (inputs `(("ghc-ansi-terminal" ,ghc-ansi-terminal) -- cgit v1.2.3 From 24d919ffbdfed549b02f765e5854f54ada5bc5f7 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:02:44 -0400 Subject: gnu: ghc-wai-conduit: Update to 3.0.0.4. * gnu/packages/haskell-web.scm (ghc-wai-conduit): Update to 3.0.0.4. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 10bcbd2899..ed1e02f4aa 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -502,7 +502,7 @@ functionality.") (define-public ghc-wai-conduit (package (name "ghc-wai-conduit") - (version "3.0.0.3") + (version "3.0.0.4") (source (origin (method url-fetch) @@ -511,7 +511,7 @@ functionality.") "wai-conduit-" version ".tar.gz")) (sha256 (base32 - "1zvsiwjq2mvkb9sjgp3ly9m968m7a2jjzr4id6jpi3mmqykj15z4")))) + "07yn41rn2skd5p3wqqa09wa761vj7ibl8l19gh4bi4i8slxhk417")))) (build-system haskell-build-system) (inputs `(("ghc-conduit" ,ghc-conduit) -- cgit v1.2.3 From 47334ea099f3ed71cf0f9613d3f3e21d85834575 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:16:59 -0400 Subject: gnu: ghc-warp: Update to 3.2.23. * gnu/packages/haskell-web.scm (ghc-warp): Update to 3.2.23. [arguments]: Enable tests. [inputs]: Remove ghc-blaze-builder, ghc-bytestring-builder, and ghc-lifted-base; add ghc-bsb-http-chunked. [native-inputs]: Remove ghc-auto-update and ghc-http; add curl, ghc-lifted-base, and ghc-http-client. --- gnu/packages/haskell-web.scm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index ed1e02f4aa..cf57e8fd96 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -23,6 +23,7 @@ (define-module (gnu packages haskell-web) #:use-module (gnu packages) + #:use-module (gnu packages curl) #:use-module (gnu packages haskell) #:use-module (gnu packages haskell-check) #:use-module (gnu packages haskell-crypto) @@ -551,7 +552,7 @@ transfers.") (define-public ghc-warp (package (name "ghc-warp") - (version "3.2.11.1") + (version "3.2.23") (source (origin (method url-fetch) @@ -560,15 +561,12 @@ transfers.") ".tar.gz")) (sha256 (base32 - "1zp5cy0bbj508vdvms1n5z80z37m253kwsqc5a83cfc990n6fgw5")))) + "12v9qhi4hyp0sb90yddsax16jj7x47nmqwn53sv7b5nszcxgzam0")))) (build-system haskell-build-system) - (arguments - `(#:tests? #f)) ; FIXME: Test-Suite `spec` fails. (inputs `(("ghc-async" ,ghc-async) ("ghc-auto-update" ,ghc-auto-update) - ("ghc-blaze-builder" ,ghc-blaze-builder) - ("ghc-bytestring-builder" ,ghc-bytestring-builder) + ("ghc-bsb-http-chunked" ,ghc-bsb-http-chunked) ("ghc-case-insensitive" ,ghc-case-insensitive) ("ghc-hashable" ,ghc-hashable) ("ghc-http-types" ,ghc-http-types) @@ -581,18 +579,18 @@ transfers.") ("ghc-vault" ,ghc-vault) ("ghc-wai" ,ghc-wai) ("ghc-word8" ,ghc-word8) - ("ghc-lifted-base" ,ghc-lifted-base) ("ghc-http-date" ,ghc-http-date) ("ghc-simple-sendfile" ,ghc-simple-sendfile) ("ghc-http2" ,ghc-http2))) (native-inputs - `(("ghc-silently" ,ghc-silently) + `(("curl" ,curl) + ("ghc-silently" ,ghc-silently) ("ghc-hspec" ,ghc-hspec) - ("ghc-auto-update" ,ghc-auto-update) ("ghc-doctest" ,ghc-doctest) + ("ghc-lifted-base" ,ghc-lifted-base) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-hunit" ,ghc-hunit) - ("ghc-http" ,ghc-http) + ("ghc-http-client" ,ghc-http-client) ("hspec-discover" ,hspec-discover))) (home-page "http://github.com/yesodweb/wai") (synopsis "HTTP server library for Haskell's WAI") -- cgit v1.2.3 From 6ef07930743b1c2d81c9b3a026b5f66ce1b4f74b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:24:28 -0400 Subject: gnu: ghc-warp-tls: Update to 3.2.4.3. * gnu/packages/haskell-web.scm (ghc-warp-tls): Update to 3.2.4.3. [inputs]: Add ghc-tls-session-manager. --- gnu/packages/haskell-web.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index cf57e8fd96..9f96727a86 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -627,7 +627,7 @@ limitation, automatic pruning, energy saving and replay resistance.") (define-public ghc-warp-tls (package (name "ghc-warp-tls") - (version "3.2.3") + (version "3.2.4.3") (source (origin (method url-fetch) @@ -636,7 +636,7 @@ limitation, automatic pruning, energy saving and replay resistance.") "warp-tls-" version ".tar.gz")) (sha256 (base32 - "14m2bzk5ivz9gdpxlcj6qnh46f2lycm1ybdjnfkj2876zrqwii7m")))) + "17gj295fr98l7mkz2gdz6kahdnmja0sql3kvy2zab6q168g53kc4")))) (build-system haskell-build-system) (inputs `(("ghc-cryptonite" ,ghc-cryptonite) @@ -644,6 +644,7 @@ limitation, automatic pruning, energy saving and replay resistance.") ("ghc-network" ,ghc-network) ("ghc-streaming-commons" ,ghc-streaming-commons) ("ghc-tls" ,ghc-tls) + ("ghc-tls-session-manager" ,ghc-tls-session-manager) ("ghc-wai" ,ghc-wai) ("ghc-warp" ,ghc-warp))) (home-page "http://github.com/yesodweb/wai") -- cgit v1.2.3 From 0ea695f67754c18a85d384dd32602f0a998549e0 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:24:48 -0400 Subject: gnu: ghc-yesod-core: Update to 1.6.6. * gnu/packages/haskell-web.scm (ghc-yesod-core): Update to 1.6.6. [inputs]: Add ghc-unliftio and ghc-rio. --- gnu/packages/haskell-web.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 9f96727a86..2271e1e982 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -1069,7 +1069,7 @@ avoid any issues with characters.") (define-public ghc-yesod-core (package (name "ghc-yesod-core") - (version "1.4.37") + (version "1.6.6") (source (origin (method url-fetch) @@ -1078,7 +1078,7 @@ avoid any issues with characters.") "yesod-core-" version ".tar.gz")) (sha256 (base32 - "0ww8hl0cx2g58zrdx3j6d5m2xwhssbajdqws1xk6rzl7rpfm1b9j")))) + "0xahf6m5c7mkl74p0gimy4wb5w4s3lh92wwxmk517fbq666c92kb")))) (build-system haskell-build-system) (inputs `(("ghc-wai" ,ghc-wai) ("ghc-extra" ,ghc-extra) @@ -1089,6 +1089,7 @@ avoid any issues with characters.") ("ghc-random" ,ghc-random) ("ghc-cereal" ,ghc-cereal) ("ghc-old-locale" ,ghc-old-locale) + ("ghc-unliftio" ,ghc-unliftio) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-monad-control" ,ghc-monad-control) ("ghc-transformers-base" ,ghc-transformers-base) @@ -1103,6 +1104,7 @@ avoid any issues with characters.") ("ghc-monad-logger" ,ghc-monad-logger) ("ghc-conduit" ,ghc-conduit) ("ghc-resourcet" ,ghc-resourcet) + ("ghc-rio" ,ghc-rio) ("ghc-lifted-base" ,ghc-lifted-base) ("ghc-blaze-html" ,ghc-blaze-html) ("ghc-blaze-markup" ,ghc-blaze-markup) -- cgit v1.2.3 From 1689d39cd264c7794189eea243ed0b147896610f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:32:05 -0400 Subject: gnu: ghc-yesod-persistent: Update to 1.6.0. * gnu/packages/haskell-web.scm (ghc-yesod-persistent): Update to 1.6.0. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 2271e1e982..0b8f287024 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -1140,7 +1140,7 @@ functions, widgets, etc.") (define-public ghc-yesod-persistent (package (name "ghc-yesod-persistent") - (version "1.4.3") + (version "1.6.0") (source (origin (method url-fetch) @@ -1149,7 +1149,7 @@ functions, widgets, etc.") "yesod-persistent-" version ".tar.gz")) (sha256 (base32 - "0kiksw46c8ww9yiwl28pkrppx8d6fhsasr0hvmsliqbrp16likj8")))) + "1gd59xf7b6v3cald58mzwnfbdzjr49cz60rm4wc5w9pvfx12pgj2")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: hspec-discover not available in PATH. (inputs `(("ghc-yesod-core" ,ghc-yesod-core) -- cgit v1.2.3 From 69054c92854075ffc2027ef9a6459540571ef1f2 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:33:31 -0400 Subject: gnu: ghc-yesod-form: Update to 1.6.2. * gnu/packages/haskell-web.scm (ghc-yesod-form): Update to 1.6.2. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 0b8f287024..85b88aa72e 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -1173,7 +1173,7 @@ from Yesod.") (define-public ghc-yesod-form (package (name "ghc-yesod-form") - (version "1.4.16") + (version "1.6.2") (source (origin (method url-fetch) @@ -1183,7 +1183,7 @@ from Yesod.") ".tar.gz")) (sha256 (base32 - "0lij3m5vn8nvh6y88r1dhk03xmmjwmjzazm307nc2wvc5fmx9p2j")))) + "1p1x1hffvarplc82ykdk7rm6p5isqgqf78bvxzpfhncxs4kwx057")))) (build-system haskell-build-system) (inputs `(("ghc-yesod-core" ,ghc-yesod-core) -- cgit v1.2.3 From 662fd1a868ef11479030a00f5e485308c707da91 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 29 Aug 2018 01:35:00 -0400 Subject: gnu: ghc-yesod: Update to 1.6.0. * gnu/packages/haskell-web.scm (ghc-yesod): Update to 1.6.0. --- gnu/packages/haskell-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 85b88aa72e..68dcd9e4b1 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -1216,7 +1216,7 @@ providing richtext field using Nic editor. ") (define-public ghc-yesod (package (name "ghc-yesod") - (version "1.4.5") + (version "1.6.0") (source (origin (method url-fetch) @@ -1225,7 +1225,7 @@ providing richtext field using Nic editor. ") version ".tar.gz")) (sha256 (base32 - "1sg66nq8yaas2m5nqsdrxricvcizd1ik02zqk60sxh3wna08fz16")))) + "0wx77nbpzdh40p1bm527kimfj48vs9d2avpvvz2w42zi3pz2y94a")))) (build-system haskell-build-system) (inputs `(("ghc-yesod-core" ,ghc-yesod-core) -- cgit v1.2.3 From 8fe9ab95793c85f391613c789ee71515663f1b79 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 4 Sep 2018 23:52:09 -0400 Subject: gnu: Remove ghc-pandoc@1. This old version of Pandoc no longer builds with GHC 8.4.3. * gnu/packages/haskell-web.scm (ghc-aeson-for-pandoc-1): Remove variable. * gnu/packages/haskell.scm (ghc-pandoc-types-for-pandoc-1, ghc-texmath-for-pandoc-1, ghc-yaml-for-pandoc-1, ghc-hslua-for-pandoc-1, ghc-skylighting-for-pandoc-1, ghc-doctemplates-for-pandoc-1, ghc-pandoc-1, ghc-pandoc-citeproc-with-pandoc-1): Remove variables. --- gnu/packages/haskell-web.scm | 12 --- gnu/packages/haskell.scm | 212 ------------------------------------------- 2 files changed, 224 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 68dcd9e4b1..eaa7e6a9ec 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -852,18 +852,6 @@ for Haskell, optimized for ease of use and high performance. (A note on naming: in Greek mythology, Aeson was the father of Jason.)") (license license:bsd-3))) -(define-public ghc-aeson-for-pandoc-1 - (package (inherit ghc-aeson) - (version "1.1.2.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/aeson/aeson-" - version ".tar.gz")) - (sha256 - (base32 - "1zy5z8pzvh53qkjm0nm3f4rwqfqg3867ck8ncd6mrxpcyvxqqj1p")))))) - (define-public ghc-aeson-pretty (package (name "ghc-aeson-pretty") diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 170d3bdc5d..e39c5e0b81 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5757,25 +5757,6 @@ pandoc to represent structured documents. It also provides functions for building up, manipulating and serialising @code{Pandoc} structures.") (license license:bsd-3))) -(define-public ghc-pandoc-types-for-pandoc-1 - (package (inherit ghc-pandoc-types) - (version "1.17.0.5") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "pandoc-types/pandoc-types-" - version ".tar.gz")) - (sha256 - (base32 - "1csipjdq00iiq77k2wlrg4i7afrzlh8nl585q785xzw7nn45b0n8")))) - (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck" - "--allow-newer=HUnit"))) - (inputs - `(("ghc-syb" ,ghc-syb) - ("ghc-aeson" ,ghc-aeson-for-pandoc-1) - ("ghc-string-qq" ,ghc-string-qq))))) - (define-public ghc-texmath (package (name "ghc-texmath") @@ -5808,26 +5789,6 @@ markup formats). The TeX reader supports basic LaTeX and AMS extensions, and it can parse and apply LaTeX macros.") (license license:gpl2+))) -(define-public ghc-texmath-for-pandoc-1 - (package (inherit ghc-texmath) - (version "0.9.4.4") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "texmath/texmath-" version ".tar.gz")) - (sha256 - (base32 - "129q33m56diiv35kdwfb07838wrg0mm88kxdqxfyl1zvf9nzkqkd")))) - (inputs - `(("ghc-network-uri" ,ghc-network-uri) - ("ghc-pandoc-types" ,ghc-pandoc-types-for-pandoc-1) - ("ghc-parsec" ,ghc-parsec) - ("ghc-split" ,ghc-split) - ("ghc-syb" ,ghc-syb) - ("ghc-temporary" ,ghc-temporary) - ("ghc-utf8-string" ,ghc-utf8-string) - ("ghc-xml" ,ghc-xml))))) - (define-public ghc-regex-pcre-builtin (package (name "ghc-regex-pcre-builtin") @@ -6382,12 +6343,6 @@ back-ends.") "This package provides a library to parse and render YAML documents.") (license license:bsd-3))) -(define-public ghc-yaml-for-pandoc-1 - (package (inherit ghc-yaml) - (inputs - `(("ghc-aeson" ,ghc-aeson-for-pandoc-1) - ,@(alist-delete "ghc-aeson" (package-inputs ghc-yaml)))))) - (define-public ghc-filemanip (package (name "ghc-filemanip") @@ -6489,27 +6444,6 @@ TIFF and GIF formats.") described in @url{https://www.lua.org/}.") (license license:expat))) -(define-public ghc-hslua-for-pandoc-1 - (package (inherit ghc-hslua) - (version "0.4.1") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "hslua/hslua-" version ".tar.gz")) - (sha256 - (base32 - "0gqp6qhp4v24kzv2j49kgk7bxqzw0w10x0zr0r2j9wkfavqb9wid")))) - (inputs - `(("lua" ,lua-5.1) - ("ghc-text" ,ghc-text))) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) - ("ghc-hspec" ,ghc-hspec) - ("ghc-hspec-contrib" ,ghc-hspec-contrib) - ("ghc-hunit" ,ghc-hunit) - ("hspec-discover" ,hspec-discover))))) - (define-public ghc-hslua-module-text (package (name "ghc-hslua-module-text") @@ -6763,56 +6697,6 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") `(("ghc-skylighting-core" ,ghc-skylighting-core) ,@(package-inputs ghc-skylighting-core))))) -(define-public ghc-skylighting-for-pandoc-1 - (package (inherit ghc-skylighting) - (version "0.1.1.5") - (source (origin - (method git-fetch) - ;; We take the sources from Github, because the tarball on - ;; hackage does not include the XML files. - (uri (git-reference - (url "https://github.com/jgm/skylighting.git") - (commit version))) - (file-name (string-append "ghc-skylighting-" version "-checkout")) - (sha256 - (base32 - "0z3yv8v2fqqgv6lsf0ff3ld0h2vkg97b2jiry9wn2f1rizwdqmzl")))) - (arguments - `(#:configure-flags '("-fbootstrap") - #:phases - (modify-phases %standard-phases - ;; After building the skylighting-extract tool we use it to generate - ;; syntax source files from the included XML files. These are then - ;; added to the skylighting.cabal file. - (add-after 'build 'extract-xml - (lambda _ - (make-file-writable "skylighting.cabal") - (apply invoke "./dist/build/skylighting-extract/skylighting-extract" - (find-files "xml" "\\.xml$")) - #t)) - ;; Reconfigure without bootstrap flag - (add-after 'extract-xml 'configure-again - (lambda* (#:key outputs inputs tests? #:allow-other-keys) - ((assoc-ref %standard-phases 'configure) - #:outputs outputs - #:inputs inputs - #:tests? tests? - #:configure-flags '("-f-bootstrap")))) - (add-after 'configure-again 'build-again - (assoc-ref %standard-phases 'build))))) - (inputs - `(("ghc-aeson" ,ghc-aeson-for-pandoc-1) - ("ghc-ansi-terminal" ,ghc-ansi-terminal) - ("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-case-insensitive" ,ghc-case-insensitive) - ("ghc-diff" ,ghc-diff) - ("ghc-hxt" ,ghc-hxt) - ("ghc-pretty-show" ,ghc-pretty-show) - ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin) - ("ghc-safe" ,ghc-safe) - ("ghc-text" ,ghc-text) - ("ghc-utf8-string" ,ghc-utf8-string))))) - (define-public ghc-doctemplates (package (name "ghc-doctemplates") @@ -6844,29 +6728,6 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") "This package provides a simple text templating system used by pandoc.") (license license:bsd-3))) -(define-public ghc-doctemplates-for-pandoc-1 - (package (inherit ghc-doctemplates) - (version "0.1.0.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "doctemplates/doctemplates-" - version ".tar.gz")) - (sha256 - (base32 - "0swal6rjya1293mwvl63jch5fx9ghpsil7qs4v7rpansa0izalmp")))) - (build-system haskell-build-system) - (inputs - `(("ghc-aeson" ,ghc-aeson-for-pandoc-1) - ("ghc-blaze-markup" ,ghc-blaze-markup) - ("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-text" ,ghc-text) - ("ghc-vector" ,ghc-vector) - ("ghc-parsec" ,ghc-parsec) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-scientific" ,ghc-scientific))))) - (define-public ghc-pandoc (package (name "ghc-pandoc") @@ -6956,66 +6817,6 @@ definition lists, tables, and other features. A compatibility mode is provided for those who need a drop-in replacement for Markdown.pl.") (license license:gpl2+))) -;; This is the last version of Pandoc 1.x, which is preferred for Rmarkdown. -(define-public ghc-pandoc-1 - (package (inherit ghc-pandoc) - (version "1.19.2.4") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/pandoc/pandoc-" - version ".tar.gz")) - (sha256 - (base32 - "0mim429mpakrcnm50csxyqk3ljcx2l26r5grk6w9isnggwgqrq5v")))) - (arguments - `(#:configure-flags (list "--allow-newer=skylighting"))) - (inputs - `(("ghc-aeson" ,ghc-aeson-for-pandoc-1) - ("ghc-ansi-terminal" ,ghc-ansi-terminal) - ("ghc-base64-bytestring" ,ghc-base64-bytestring) - ("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-blaze-markup" ,ghc-blaze-markup) - ("ghc-cmark" ,ghc-cmark) - ("ghc-data-default" ,ghc-data-default) - ("ghc-deepseq-generics" ,ghc-deepseq-generics) - ("ghc-diff" ,ghc-diff) - ("ghc-doctemplates" ,ghc-doctemplates-for-pandoc-1) - ("ghc-executable-path" ,ghc-executable-path) - ("ghc-extensible-exceptions" ,ghc-extensible-exceptions) - ("ghc-filemanip" ,ghc-filemanip) - ("ghc-haddock-library" ,ghc-haddock-library) - ("ghc-hslua" ,ghc-hslua-for-pandoc-1) - ("ghc-http" ,ghc-http) - ("ghc-http-client" ,ghc-http-client) - ("ghc-http-client-tls" ,ghc-http-client-tls) - ("ghc-http-types" ,ghc-http-types) - ("ghc-juicypixels" ,ghc-juicypixels) - ("ghc-network" ,ghc-network) - ("ghc-network-uri" ,ghc-network-uri) - ("ghc-old-time" ,ghc-old-time) - ("ghc-pandoc-types" ,ghc-pandoc-types-for-pandoc-1) - ("ghc-parsec" ,ghc-parsec) - ("ghc-random" ,ghc-random) - ("ghc-scientific" ,ghc-scientific) - ("ghc-sha" ,ghc-sha) - ("ghc-skylighting" ,ghc-skylighting-for-pandoc-1) - ("ghc-syb" ,ghc-syb) - ("ghc-tagsoup" ,ghc-tagsoup) - ("ghc-temporary" ,ghc-temporary) - ("ghc-texmath" ,ghc-texmath-for-pandoc-1) - ("ghc-text" ,ghc-text) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-vector" ,ghc-vector) - ("ghc-xml" ,ghc-xml) - ("ghc-yaml" ,ghc-yaml-for-pandoc-1) - ("ghc-zip-archive" ,ghc-zip-archive) - ("ghc-zlib" ,ghc-zlib))) - (native-inputs - `(("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))))) - (define-public ghc-hs-bibutils (package (name "ghc-hs-bibutils") @@ -7251,19 +7052,6 @@ and also has a mode for converting bibliographic databases a YAML format suitable for inclusion in pandoc YAML metadata.") (license license:bsd-3))) -(define-public ghc-pandoc-citeproc-with-pandoc-1 - (let ((for-pandoc-1 - (package-input-rewriting - `((,ghc-aeson . ,ghc-aeson-for-pandoc-1) - (,ghc-yaml . ,ghc-yaml-for-pandoc-1) - (,ghc-texmath . ,ghc-texmath-for-pandoc-1) - (,ghc-pandoc-types . ,ghc-pandoc-types-for-pandoc-1) - (,ghc-hslua . ,ghc-hslua-for-pandoc-1) - (,ghc-skylighting . ,ghc-skylighting-for-pandoc-1) - (,ghc-doctemplates . ,ghc-doctemplates-for-pandoc-1) - (,ghc-pandoc . ,ghc-pandoc-1))))) - (for-pandoc-1 ghc-pandoc-citeproc))) - (define-public ghc-union-find (package (name "ghc-union-find") -- cgit v1.2.3 From a45c64701b5599bb527fd8cf2070174f9e866d3d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Oct 2018 18:28:49 +0200 Subject: gnu: ghc-http-conduit: Remove ghc-http-client from native-inputs. * gnu/packages/haskell-web.scm (ghc-http-conduit)[native-inputs]: Remove ghc-http-client. --- gnu/packages/haskell-web.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index eaa7e6a9ec..2e404e2fcf 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -369,7 +369,6 @@ and HPACK. Currently HTTP/2 16 framing and HPACK 10 is supported.") ("ghc-warp" ,ghc-warp) ("ghc-wai-conduit" ,ghc-wai-conduit) ("ghc-http-types" ,ghc-http-types) - ("ghc-http-client" ,ghc-http-client) ("ghc-cookie" ,ghc-cookie) ("ghc-conduit-extra" ,ghc-conduit-extra) ("ghc-streaming-commons" ,ghc-streaming-commons) -- cgit v1.2.3