From 545de2a28cb5e6f9c6cf0fcf045f867f5db5db51 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 15 Aug 2018 11:22:21 +0200 Subject: gnu: ghc-tagsoup: Update to 0.14.6. * gnu/packages/haskell-web.scm (ghc-tagsoup): Update to 0.14.6. --- gnu/packages/haskell-web.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 1f19f82f3f..83de9614d0 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -36,17 +36,15 @@ (define-module (gnu packages haskell-web) (define-public ghc-tagsoup (package (name "ghc-tagsoup") - (version "0.14.3") + (version "0.14.6") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/tagsoup/tagsoup-" - version - ".tar.gz")) + (uri (string-append "https://hackage.haskell.org/package/tagsoup/" + "tagsoup-" version ".tar.gz")) (sha256 (base32 - "00j2rm2sx0syn16kg2402fz4k8yqfl9knmi367jsiycds1q9zzf9")))) + "1yv3dbyb0i1yqm796jgc4jj5kxkla1sxb3b2klw5ks182kdx8kjb")))) (build-system haskell-build-system) (inputs `(("ghc-text" ,ghc-text))) (native-inputs -- cgit v1.2.3 From 57f25c7d9eb392c8332809fe175466c93922a3d4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 15 Aug 2018 11:22:41 +0200 Subject: gnu: Add ghc-httpd-shed. * gnu/packages/haskell-web.scm (ghc-httpd-shed): 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 83de9614d0..6154aa2174 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -91,6 +91,30 @@ (define-public ghc-cookie (description "HTTP cookie parsing and rendering library for Haskell.") (license license:bsd-3))) +(define-public ghc-httpd-shed + (package + (name "ghc-httpd-shed") + (version "0.4.0.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/httpd-shed/" + "httpd-shed-" version ".tar.gz")) + (sha256 + (base32 + "064jy1mqhnf1hvq6s04wlhmp916rd522x58djb9qixv13vc8gzxh")))) + (build-system haskell-build-system) + (inputs + `(("ghc-network-uri" ,ghc-network-uri) + ("ghc-network" ,ghc-network))) + (home-page "https://hackage.haskell.org/package/httpd-shed") + (synopsis "Simple web-server with an interact style API") + (description + "This web server promotes a function from @code{Request} to @code{IO +Response} into a local web server. The user can decide how to interpret the +requests, and the library is intended for implementing Ajax APIs.") + (license license:bsd-3))) + (define-public ghc-http-types (package (name "ghc-http-types") -- cgit v1.2.3 From 7da274a808a40bc23d2d854a3e96070d31a56d95 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 15 Aug 2018 11:22:55 +0200 Subject: gnu: ghc-http-types: Update to 0.12.1. * gnu/packages/haskell-web.scm (ghc-http-types): Update to 0.12.1. --- gnu/packages/haskell-web.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 6154aa2174..32a7d29aec 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -118,17 +118,15 @@ (define-public ghc-httpd-shed (define-public ghc-http-types (package (name "ghc-http-types") - (version "0.11") + (version "0.12.1") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/http-types/http-types-" - version - ".tar.gz")) + (uri (string-append "https://hackage.haskell.org/package/http-types/" + "http-types-" version ".tar.gz")) (sha256 (base32 - "08w30rf1i7kbh2j1iajqmj6yhhmglnb8kjggc8kdni3xahhrgcss")))) + "1wv9k6nlvkdsxwlr7gaynphvzmvi5211gvwq96mbcxgk51a739rz")))) (build-system haskell-build-system) (native-inputs `(("ghc-doctest" ,ghc-doctest) -- cgit v1.2.3 From 6c7a3279adcac004080dc0771e8bf6822d3a28a2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 15 Aug 2018 11:23:36 +0200 Subject: gnu: ghc-http-client: Update to 0.5.13.1. * gnu/packages/haskell-web.scm (ghc-http-client): Update to 0.5.13.1. [inputs]: Sort; add ghc-memory. --- gnu/packages/haskell-web.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 32a7d29aec..e5ac001fad 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -181,7 +181,7 @@ (define-public ghc-http (define-public ghc-http-client (package (name "ghc-http-client") - (version "0.5.7.1") + (version "0.5.13.1") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -189,27 +189,28 @@ (define-public ghc-http-client version ".tar.gz")) (sha256 (base32 - "19cvnnfcjj2m3pgs6ivyjs21rw9wx5ynarh6hvb27a76cscai2fy")))) + "0szwbgvkkdz56lgi91armkagmb7nnfwbpp4j7cm9zhmffv3ba8g1")))) (build-system haskell-build-system) ;; Tests require access to the web. (arguments `(#:tests? #f)) (inputs - `(("ghc-text" ,ghc-text) - ("ghc-http-types" ,ghc-http-types) + `(("ghc-async" ,ghc-async) + ("ghc-base64-bytestring" ,ghc-base64-bytestring) ("ghc-blaze-builder" ,ghc-blaze-builder) - ("ghc-data-default-class" ,ghc-data-default-class) - ("ghc-network" ,ghc-network) - ("ghc-streaming-commons" ,ghc-streaming-commons) ("ghc-case-insensitive" ,ghc-case-insensitive) - ("ghc-base64-bytestring" ,ghc-base64-bytestring) ("ghc-cookie" ,ghc-cookie) + ("ghc-data-default-class" ,ghc-data-default-class) ("ghc-exceptions" ,ghc-exceptions) - ("ghc-random" ,ghc-random) + ("ghc-http-types" ,ghc-http-types) + ("ghc-memory" ,ghc-memory) ("ghc-mime-types" ,ghc-mime-types) - ("ghc-network-uri" ,ghc-network-uri) ("ghc-monad-control" ,ghc-monad-control) - ("ghc-zlib" ,ghc-zlib) - ("ghc-async" ,ghc-async))) + ("ghc-network" ,ghc-network) + ("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))) (home-page "https://github.com/snoyberg/http-client") -- cgit v1.2.3 From 828c9ff83180efe4a8d894738c38360f45552e81 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 15 Aug 2018 11:24:25 +0200 Subject: gnu: ghc-http-conduit: Update to 2.3.2. * gnu/packages/haskell-web.scm (ghc-http-conduit): Update to 2.3.2. [inputs]: Add ghc-unliftio. --- gnu/packages/haskell-web.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index e5ac001fad..a853eb3cdc 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -318,15 +318,16 @@ (define-public ghc-http2 (define-public ghc-http-conduit (package (name "ghc-http-conduit") - (version "2.2.4") + (version "2.3.2") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "http-conduit-" version "/" "http-conduit-" version ".tar.gz")) - (sha256 (base32 - "1wcl3lpg4v1ylq9j77j9fmf6l9qbmp8dmj3a9829q19q6bbgza7l")))) + (sha256 + (base32 + "1iay4hr0mj8brkxvgkv1liqa8irl9axfc3qhn8qsvcyq4n1l95km")))) (build-system haskell-build-system) ;; FIXME: `httpLbs TLS` in test-suite `test` fails with ;; ConnectionFailure getProtocolByName: does not exist (no such protocol @@ -343,7 +344,8 @@ (define-public ghc-http-conduit ("ghc-http-client-tls" ,ghc-http-client-tls) ("ghc-monad-control" ,ghc-monad-control) ("ghc-mtl" ,ghc-mtl) - ("ghc-exceptions" ,ghc-exceptions))) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-unliftio" ,ghc-unliftio))) (native-inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-hspec" ,ghc-hspec) -- cgit v1.2.3 From 83c4a5bd38bdcd39a2bf6645a3b02e93cf9a277b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 15 Aug 2018 11:43:15 +0200 Subject: gnu: ghc-blaze-html: Allow build with newer HUnit. * gnu/packages/haskell-web.scm (ghc-blaze-html)[arguments]: Allow newer HUnit. --- gnu/packages/haskell-web.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index a853eb3cdc..b4d7e9cce6 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -737,7 +737,8 @@ (define-public ghc-blaze-html "0r0acv47nh75bmf7kjyfvhcwz8f02rn9x0a1l80pzgyczfrsmkmf")))) (build-system haskell-build-system) (arguments - `(#:configure-flags (list "--allow-newer=QuickCheck"))) + `(#: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 4aa46e40e8b9ad1ba29ed7f50b26419bb5134016 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 15 Aug 2018 11:44:13 +0200 Subject: gnu: ghc-http: Update to 4000.3.12. * gnu/packages/haskell-web.scm (ghc-http): Update to 4000.3.12. [native-inputs]: Add ghc-httpd-shed, ghc-test-framework, and ghc-test-framework-hunit. [inputs]: Add ghc-case-insensitive, ghc-conduit, ghc-conduit-extra, ghc-http-types, ghc-puremd5, and ghc-split. --- gnu/packages/haskell-web.scm | 27 +++++++++++++++++---------- 1 file changed, 17 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 b4d7e9cce6..a043ffcc0d 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -147,29 +147,36 @@ (define-public ghc-http-types (define-public ghc-http (package (name "ghc-http") - (version "4000.3.3") + (version "4000.3.12") (outputs '("out" "doc")) (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/HTTP/HTTP-" - version - ".tar.gz")) + (uri (string-append "https://hackage.haskell.org/package/HTTP/" + "HTTP-" version ".tar.gz")) (sha256 (base32 - "1wlvvqcxsnd2is3khsla0vd8i9cy12v1pg6d6i13ihcd131a7bdv")))) + "140r6qy1ay25piv0z3hih11zhigyi08nkwc32097j43pjff6mzx3")))) (build-system haskell-build-system) (native-inputs - `(("ghc-hunit" ,ghc-hunit))) + `(("ghc-httpd-shed" ,ghc-httpd-shed) + ("ghc-hunit" ,ghc-hunit) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) (inputs - `(("ghc-old-time" ,ghc-old-time) + `(("ghc-case-insensitive" ,ghc-case-insensitive) + ("ghc-conduit" ,ghc-conduit) + ("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-mtl" ,ghc-mtl) ("ghc-network" ,ghc-network) - ("ghc-network-uri" ,ghc-network-uri))) + ("ghc-network-uri" ,ghc-network-uri) + ("ghc-split" ,ghc-split))) (arguments - `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. + `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. (home-page "https://github.com/haskell/HTTP") (synopsis "Library for client-side HTTP") (description -- cgit v1.2.3