me
/
guix
Archived
1
0
Fork 0
Code

gnu: Update Haskell ecosystem. 

Bump packages’ versions to the lastest Stackage or Hackage
release. Since packages are interdependent, do so in a single commit.

525 packages have been updated.

These packages have been removed, because they fail to build, have no
newer version available and no dependencies:

corrode
ghc-easytest
ghc-edisonapi
ghc-edisoncore
ghc-pandoc-types
ghc-regex-tdfa-text

These have been removed, because they are no longer required:

ghc-happy-1.19.9
ghc-prettyprinter-1.6
ghc-protolude-0.3

ghc-pandoc-citeproc and pandoc-citeproc have been removed, because pandoc
does not use them any more.

Co-authored-by: Xinglu Chen <public@yoctocell.xyz>
master
Lars-Dominik Braun 2021-09-20 10:49:34 +02:00
parent b74ca403cb
commit b97f549b14
No known key found for this signature in database
GPG Key ID: F663943E08D8092A
25 changed files with 3017 additions and 2258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/local.mk
View File

@ -1113,13 +1113,8 @@ dist_patch_DATA = \
%D%/packages/patches/geoclue-config.patch \
%D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \
%D%/packages/patches/ghc-testsuite-dlopen-pie.patch \
%D%/packages/patches/ghc-diff-swap-cover-args.patch \
%D%/packages/patches/ghc-haddock-api-fix-haddock.patch \
%D%/packages/patches/ghc-hpack-fix-tests.patch \
%D%/packages/patches/ghc-microlens-aeson-fix-tests.patch \
%D%/packages/patches/ghc-language-haskell-extract-ghc-8.10.patch \
%D%/packages/patches/ghc-monad-par-fix-tests.patch \
%D%/packages/patches/ghc-pandoc-fix-html-tests.patch \
%D%/packages/patches/ghc-pandoc-fix-latex-test.patch \
%D%/packages/patches/ghostscript-CVE-2020-15900.patch \
%D%/packages/patches/ghostscript-freetype-compat.patch \
%D%/packages/patches/ghostscript-no-header-id.patch \
@ -1623,7 +1618,6 @@ dist_patch_DATA = \
%D%/packages/patches/pulseaudio-fix-mult-test.patch \
%D%/packages/patches/pulseaudio-longer-test-timeout.patch \
%D%/packages/patches/pulseview-qt515-compat.patch \
%D%/packages/patches/purescript-relax-dependencies.patch \
%D%/packages/patches/pybugz-encode-error.patch \
%D%/packages/patches/pybugz-stty.patch \
%D%/packages/patches/pygpgme-disable-problematic-tests.patch \

50
gnu/packages/agda.scm
View File

@ -37,7 +37,7 @@
(define-public agda
(package
(name "agda")
(version "2.6.0.1")
(version "2.6.2")
(source
(origin
(method url-fetch)
@ -46,7 +46,7 @@
version ".tar.gz"))
(sha256
(base32
"1s600ry1qwizr3ynyj05rvlx7jdcw9a1viyc0ycjamm5sjf8mf3v"))))
"159hznnsxg7hlp80r1wqizyd7gwgnq0j13cm4d27cns0ganslb07"))))
(build-system haskell-build-system)
(inputs
`(("ghc-aeson" ,ghc-aeson)
@ -54,23 +54,22 @@
("ghc-async" ,ghc-async)
("ghc-blaze-html" ,ghc-blaze-html)
("ghc-boxes" ,ghc-boxes)
("ghc-case-insensitive" ,ghc-case-insensitive)
("ghc-data-hash" ,ghc-data-hash)
("ghc-edisoncore" ,ghc-edisoncore)
("ghc-edit-distance" ,ghc-edit-distance)
("ghc-equivalence" ,ghc-equivalence)
("ghc-exceptions" ,ghc-exceptions)
("ghc-filemanip" ,ghc-filemanip)
("ghc-geniplate-mirror" ,ghc-geniplate-mirror)
("ghc-gitrev" ,ghc-gitrev)
("ghc-happy" ,ghc-happy)
("ghc-hashable" ,ghc-hashable)
("ghc-hashtables" ,ghc-hashtables)
("ghc-ieee754" ,ghc-ieee754)
("ghc-monad-control" ,ghc-monad-control)
("ghc-murmur-hash" ,ghc-murmur-hash)
("ghc-uri-encode" ,ghc-uri-encode)
("ghc-parallel" ,ghc-parallel)
("ghc-regex-tdfa" ,ghc-regex-tdfa)
("ghc-split" ,ghc-split)
("ghc-strict" ,ghc-strict)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-uri-encode" ,ghc-uri-encode)
("ghc-zlib" ,ghc-zlib)))
(arguments
`(#:modules ((guix build haskell-build-system)
@ -84,41 +83,6 @@
(lambda _
(setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/dist/build"))
#t))
;; FIXME: This is a copy of the standard configure phase with a tiny
;; difference: this package needs the -package-db flag to be passed
;; to "runhaskell" in addition to the "configure" action, because
;; Setup.hs depends on filemanip. Without this option the Setup.hs
;; file cannot be evaluated. The haskell-build-system should be
;; changed to pass "-package-db" to "runhaskell" in any case.
(replace 'configure
(lambda* (#:key outputs inputs tests? (configure-flags '())
#:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(name-version (strip-store-file-name out))
(ghc-path (getenv "GHC_PACKAGE_PATH"))
(params
`(,(string-append "--prefix=" out)
,(string-append "--libdir=" out "/lib")
,(string-append "--docdir=" out
"/share/doc/" name-version)
"--libsubdir=$compiler/$pkg-$version"
"--package-db=../package.conf.d"
"--global"
,@(if tests?
'("--enable-tests")
'())
;; Build and link with shared libraries
"--enable-shared"
"--enable-executable-dynamic"
"--ghc-option=-fPIC"
,(string-append "--ghc-option=-optl=-Wl,-rpath=" out
"/lib/$compiler/$pkg-$version")
,@configure-flags)))
(unsetenv "GHC_PACKAGE_PATH")
(apply invoke "runhaskell" "-package-db=../package.conf.d"
"Setup.hs" "configure" params)
(setenv "GHC_PACKAGE_PATH" ghc-path)
#t)))
(add-after 'compile 'agda-compile
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))

51
gnu/packages/bioinformatics.scm
View File

@ -10541,7 +10541,6 @@ once. This package provides tools to perform Drop-seq analyses.")
("r-rjson" ,r-rjson)
("salmon" ,salmon)
("pandoc" ,pandoc)
("pandoc-citeproc" ,pandoc-citeproc)
("python-wrapper" ,python-wrapper)
("python-deeptools" ,python-deeptools)
("python-pyyaml" ,python-pyyaml)))
@ -10614,7 +10613,6 @@ expression report comparing samples in an easily configurable manner.")
("multiqc" ,multiqc)
("perl" ,perl)
("pandoc" ,pandoc)
("pandoc-citeproc" ,pandoc-citeproc)
("fastqc" ,fastqc)
("bowtie" ,bowtie)
("idr" ,idr)
@ -10682,7 +10680,6 @@ in an easily configurable manner.")
("r-ggplot2" ,r-ggplot2)
("r-ggbio" ,r-ggbio)
("pandoc" ,pandoc)
("pandoc-citeproc" ,pandoc-citeproc)
("python-wrapper" ,python-wrapper)
("python-pyyaml" ,python-pyyaml)
("snakemake" ,snakemake)
@ -10731,7 +10728,6 @@ methylation and segmentation.")
("python-numpy" ,python-numpy)
("python-loompy" ,python-loompy)
("pandoc" ,pandoc)
("pandoc-citeproc" ,pandoc-citeproc)
("samtools" ,samtools)
("snakemake" ,snakemake)
("star" ,star-for-pigx)
@ -12461,17 +12457,17 @@ datasets.")
(define-public ngless
(package
(name "ngless")
(version "1.1.0")
(version "1.3.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/ngless/ngless.git")
(url "https://github.com/ngless-toolkit/ngless.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1wim8wpqyff080dfcazynrmjwqas38m24m0v350w245mmhrapdma"))))
"0pb9f6b0yk9p4cdwiym8r190q1bcdiwvc7i2s6rw54qgi8r3g6pj"))))
(build-system haskell-build-system)
(arguments
`(#:haddock? #f ; The haddock phase fails with: NGLess/CmdArgs.hs:20:1:
@ -12546,7 +12542,7 @@ datasets.")
("ghc-http-conduit" ,ghc-http-conduit)
("ghc-inline-c" ,ghc-inline-c)
("ghc-inline-c-cpp" ,ghc-inline-c-cpp)
("ghc-intervalmap" ,ghc-intervalmap)
("ghc-int-interval-map" ,ghc-int-interval-map)
("ghc-missingh" ,ghc-missingh)
("ghc-optparse-applicative" ,ghc-optparse-applicative)
("ghc-regex" ,ghc-regex)
@ -12573,12 +12569,49 @@ datasets.")
("ghc-test-framework-hunit",ghc-test-framework-hunit)
("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2)
("ghc-test-framework-th" ,ghc-test-framework-th)))
(home-page "https://gitlab.com/ngless/ngless")
(home-page "https://ngless.embl.de/")
(synopsis "DSL for processing next-generation sequencing data")
(description "Ngless is a domain-specific language for
@dfn{next-generation sequencing} (NGS) data processing.")
(license license:expat)))
(define-public ghc-int-interval-map
(let ((commit "678763de7fe6d7fa3f1c44b32d18ce58670270f4")
(revision "1"))
(package
(name "ghc-int-interval-map")
(version "0.0.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ngless-toolkit/interval-to-int.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256 (base32 "0fd728b5if89vj5j4f9y7k0b2xv2ycz5a21iy15wbdcf5bhim7i8"))))
(build-system haskell-build-system)
(inputs
`(("ghc-either" ,ghc-either)
("ghc-primitive" ,ghc-primitive)
("ghc-vector" ,ghc-vector)
("ghc-vector-algorithms" ,ghc-vector-algorithms)))
(native-inputs
`(("ghc-hedgehog" ,ghc-hedgehog)
("ghc-tasty" ,ghc-tasty)
("ghc-tasty-hedgehog" ,ghc-tasty-hedgehog)
("ghc-tasty-hunit" ,ghc-tasty-hunit)
("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)
("ghc-tasty-th" ,ghc-tasty-th)))
(home-page "https://github.com/luispedro/interval-to-int#readme")
(synopsis "Interval map structure in Haskell")
(description "An interval map structure that is optimized for low
memory (each interval is represented by about 3 words + whatever the
cargo is) and has semantics that are appropriate for genomic intervals
(namely, intervals can overlap and queries will return all matches
together). It also designed to be used in two phases: a construction
phase + query phase).")
(license license:expat))))
(define-public filtlong
;; The recommended way to install is to clone the git repository
;; https://github.com/rrwick/Filtlong#installation

15
gnu/packages/cran.scm
View File

@ -11247,8 +11247,7 @@ correlation, censored, ordered and multivariate problems.")
"0aman4273i8hy3z0qay1nrsr7v27m4icm1j6f4w59ylix80l5myq"))))
(build-system r-build-system)
(inputs
`(("pandoc" ,pandoc)
("pandoc-citeproc" ,pandoc-citeproc)))
`(("pandoc" ,pandoc)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(propagated-inputs
@ -21432,8 +21431,7 @@ the appropriate system call provided by the underlying operating system.")
;; These inputs are needed for vignettes
(native-inputs
`(("r-knitr" ,r-knitr)
("r-rmarkdown" ,r-rmarkdown)
("pandoc-citeproc" ,pandoc-citeproc)))
("r-rmarkdown" ,r-rmarkdown)))
(home-page "https://github.com/andreyshabalin/filematrix")
(synopsis "File-backed matrix class with convenient read and write access")
(description
@ -24791,8 +24789,7 @@ recommendations for developers.")
(properties `((upstream-name . "loo")))
(build-system r-build-system)
(inputs
`(("pandoc" ,pandoc)
("pandoc-citeproc" ,pandoc-citeproc)))
`(("pandoc" ,pandoc)))
(propagated-inputs
`(("r-checkmate" ,r-checkmate)
("r-matrixstats" ,r-matrixstats)))
@ -24881,8 +24878,7 @@ need to derive the partial derivatives.")
(properties `((upstream-name . "rstanarm")))
(build-system r-build-system)
(inputs
`(("pandoc" ,pandoc)
("pandoc-citeproc" ,pandoc-citeproc)))
`(("pandoc" ,pandoc)))
(propagated-inputs
`(("r-bayesplot" ,r-bayesplot)
("r-bh" ,r-bh)
@ -28207,8 +28203,7 @@ use.")
(native-inputs
`(("r-knitr" ,r-knitr)
("r-rmarkdown" ,r-rmarkdown)
("pandoc" ,pandoc)
("pandoc-citeproc" ,pandoc-citeproc))) ; for vignettes
("pandoc" ,pandoc)))
(home-page "https://github.com/tidymodels/tidymodels")
(synopsis "Tidy collection for modeling and statistical analysis")
(description

12
gnu/packages/dhall.scm
View File

@ -30,14 +30,14 @@
(define-public dhall
(package
(name "dhall")
(version "1.32.0")
(version "1.39.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/dhall/dhall-"
version ".tar.gz"))
(sha256
(base32 "1imj0bh5365pdizvjbw2wqz0g9hakigf1zm4fr6379qdchxpp90p"))))
(base32 "1by2d84fbckspczddl4npfsf89q6nprmbg0i5g8yr1psp0fpl4ab"))))
(build-system haskell-build-system)
(inputs
`(("ghc-aeson" ,ghc-aeson)
@ -58,14 +58,16 @@
("ghc-lens-family-core" ,ghc-lens-family-core)
("ghc-megaparsec" ,ghc-megaparsec)
("ghc-memory" ,ghc-memory)
("ghc-mmorph" ,ghc-mmorph)
("ghc-network-uri" ,ghc-network-uri)
("ghc-optparse-applicative" ,ghc-optparse-applicative)
("ghc-parsers" ,ghc-parsers)
("ghc-parser-combinators" ,ghc-parser-combinators)
("ghc-prettyprinter" ,ghc-prettyprinter-1.6)
("ghc-prettyprinter" ,ghc-prettyprinter)
("ghc-prettyprinter-ansi-terminal" ,ghc-prettyprinter-ansi-terminal)
("ghc-pretty-simple" ,ghc-pretty-simple)
("ghc-profunctors" ,ghc-profunctors)
("ghc-pretty-simple" ,ghc-pretty-simple)
("ghc-repline" ,ghc-repline-0.3)
("ghc-serialise" ,ghc-serialise)
("ghc-scientific" ,ghc-scientific)
@ -91,6 +93,7 @@
("ghc-tasty-expected-failure" ,ghc-tasty-expected-failure)
("ghc-tasty-hunit" ,ghc-tasty-hunit)
("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)
("ghc-tasty-silver" ,ghc-tasty-silver)
("ghc-turtle" ,ghc-turtle)
("ghc-mockery" ,ghc-mockery)
("ghc-doctest" ,ghc-doctest)))
@ -102,8 +105,7 @@
(with-directory-excursion "dhall-lang/tests"
(for-each
delete-file
'("import/failure/referentiallyInsane.dhall"
"import/success/customHeadersA.dhall"
'("import/success/customHeadersA.dhall"
"import/success/noHeaderForwardingA.dhall"
"import/success/unit/RemoteAsTextA.dhall"
"import/success/unit/SimpleRemoteA.dhall"

15
gnu/packages/elm.scm
View File

@ -52,20 +52,11 @@
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'update-constraints
(add-before 'configure 'update-constraints
(lambda _
(substitute* "elm.cabal"
(("ansi-terminal >= 0\\.8 && < 0\\.9,")
"ansi-terminal >= 0.8 && < 0.10,")
(("containers >= 0\\.5\\.8\\.2 && < 0\\.6,")
"containers >= 0.5.8.2 && < 0.7,")
(("http-client >= 0\\.5 && < 0\\.6,")
"http-client >= 0.5 && < 0.7,")
(("language-glsl >= 0\\.0\\.2 && < 0\\.3,")
"language-glsl >= 0.0.2 && < 0.4,")
(("network >= 2\\.4 && < 2\\.7,")
"network >= 2.4 && < 2.9,"))
#t)))))
(("(ansi-terminal|containers|network|http-client|language-glsl)\\s+[^,]+" all dep)
dep)))))))
(inputs
`(("ghc-ansi-terminal" ,ghc-ansi-terminal)
("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint)

46
gnu/packages/finance.scm
View File

@ -210,7 +210,7 @@ line client and a client based on Qt.")
(define-public hledger
(package
(name "hledger")
(version "1.14.2")
(version "1.21")
(source
(origin
(method url-fetch)
@ -220,7 +220,7 @@ line client and a client based on Qt.")
".tar.gz"))
(sha256
(base32
"1si9zqparkdq77yji87lhcsrf11fr3gisqwsv82cabhrhc36x6l4"))))
"07fcfkmv4cy92njnf2qc7jh0naz96q962hxldcd7hk4k7ddv0mss"))))
(build-system haskell-build-system)
(inputs
`(("ghc-ansi-terminal" ,ghc-ansi-terminal)
@ -229,17 +229,18 @@ line client and a client based on Qt.")
("ghc-data-default" ,ghc-data-default)
("ghc-decimal" ,ghc-decimal)
("ghc-diff" ,ghc-diff)
("ghc-easytest" ,ghc-easytest)
("ghc-hashable" ,ghc-hashable)
("ghc-hledger-lib" ,ghc-hledger-lib)
("ghc-lucid" ,ghc-lucid)
("ghc-math-functions" ,ghc-math-functions)
("ghc-megaparsec" ,ghc-megaparsec)
("ghc-mtl-compat" ,ghc-mtl-compat)
("ghc-old-time" ,ghc-old-time)
("ghc-pretty-show" ,ghc-pretty-show)
("ghc-regex-tdfa" ,ghc-regex-tdfa)
("ghc-safe" ,ghc-safe)
("ghc-aeson" ,ghc-aeson)
("ghc-extra" ,ghc-extra)
("ghc-tasty" ,ghc-tasty)
("ghc-timeit" ,ghc-timeit)
("ghc-shakespeare" ,ghc-shakespeare)
("ghc-split" ,ghc-split)
("ghc-tabular" ,ghc-tabular)
@ -248,9 +249,6 @@ line client and a client based on Qt.")
("ghc-utf8-string" ,ghc-utf8-string)
("ghc-utility-ht" ,ghc-utility-ht)
("ghc-wizards" ,ghc-wizards)))
(native-inputs
`(("ghc-test-framework" ,ghc-test-framework)
("ghc-test-framework-hunit" ,ghc-test-framework-hunit)))
(home-page "https://hledger.org")
(synopsis "Command-line interface for the hledger accounting system")
(description
@ -1693,7 +1691,7 @@ generate a variety of reports from them, and provides a web interface.")
(define-public hledger-web
(package
(name "hledger-web")
(version "1.14.1")
(version "1.21")
(source
(origin
(method url-fetch)
@ -1701,38 +1699,48 @@ generate a variety of reports from them, and provides a web interface.")
"hledger-web/hledger-web-" version ".tar.gz"))
(sha256
(base32
"0w59nr7mj0nx8z44cvhy1rhlj5rmx0wq4p5nfl4dycfmp7jwvsm1"))))
"0ivszqcypw0j2wn4r7fv7dqm1pvr0b1y6rqpxagzyk8cxn3ic9g2"))))
(build-system haskell-build-system)
(arguments
`(#:tests? #f ; TODO: fail.
#:cabal-revision
("1" "1hnw10ibhbafbsfj5lzlxwjg4cjnqr5bb51n6mqbi30qqabgq78x")))
(inputs
`(("ghc-decimal" ,ghc-decimal)
("ghc-aeson" ,ghc-aeson)
`(("ghc-aeson" ,ghc-aeson)
("ghc-blaze-html" ,ghc-blaze-html)
("ghc-blaze-markup" ,ghc-blaze-markup)
("ghc-case-insensitive" ,ghc-case-insensitive)
("ghc-clientsession" ,ghc-clientsession)
("ghc-cmdargs" ,ghc-cmdargs)
("ghc-conduit" ,ghc-conduit)
("ghc-conduit-extra" ,ghc-conduit-extra)
("ghc-conduit" ,ghc-conduit)
("ghc-data-default" ,ghc-data-default)
("ghc-decimal" ,ghc-decimal)
("ghc-extra" ,ghc-extra)
("ghc-hjsmin" ,ghc-hjsmin)
("hledger" ,hledger)
("ghc-hledger-lib" ,ghc-hledger-lib)
("ghc-hspec" ,ghc-hspec)
("ghc-http-client" ,ghc-http-client)
("ghc-http-conduit" ,ghc-http-conduit)
("ghc-http-types" ,ghc-http-types)
("ghc-json" ,ghc-json)
("ghc-megaparsec" ,ghc-megaparsec)
("ghc-semigroups" ,ghc-semigroups)
("ghc-network" ,ghc-network)
("ghc-shakespeare" ,ghc-shakespeare)
("ghc-wai" ,ghc-wai)
("ghc-unix-compat" ,ghc-unix-compat)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-utf8-string" ,ghc-utf8-string)
("ghc-wai-cors" ,ghc-wai-cors)
("ghc-wai-extra" ,ghc-wai-extra)
("ghc-wai" ,ghc-wai)
("ghc-wai-handler-launch" ,ghc-wai-handler-launch)
("ghc-warp" ,ghc-warp)
("ghc-yaml" ,ghc-yaml)
("ghc-yesod" ,ghc-yesod)
("ghc-yesod-core" ,ghc-yesod-core)
("ghc-yesod-form" ,ghc-yesod-form)
("ghc-yesod-static" ,ghc-yesod-static)))
("ghc-yesod" ,ghc-yesod)
("ghc-yesod-static" ,ghc-yesod-static)
("ghc-yesod-test" ,ghc-yesod-test)
("hledger" ,hledger)))
(home-page "https://hledger.org")
(synopsis "Web-based user interface for the hledger accounting system")
(description "This package provides a simple Web-based User

130
gnu/packages/haskell-apps.scm
View File

@ -58,7 +58,7 @@
(define-public apply-refact
(package
(name "apply-refact")
(version "0.6.0.0")
(version "0.9.3.0")
(source
(origin
(method url-fetch)
@ -67,13 +67,14 @@
version ".tar.gz"))
(sha256
(base32
"0p2mqgjcqr1zcmk8zgr0yq7g8z1agsa6l493lkj6g3ya9lyhxgig"))))
"1sn5g71sx8xa4ggyk49m661iip6zrzl65vb87l16l31kf79bbm7w"))))
(build-system haskell-build-system)
(inputs
`(("ghc-refact" ,ghc-refact)
("ghc-exactprint" ,ghc-exactprint)
("ghc-syb" ,ghc-syb)
("ghc-temporary" ,ghc-temporary)
("ghc-extra" ,ghc-extra)
("ghc-uniplate" ,ghc-uniplate)
("ghc-filemanip" ,ghc-filemanip)
("ghc-unix-compat" ,ghc-unix-compat)
("ghc-optparse-applicative"
@ -91,14 +92,12 @@
library. It is primarily used with HLint's @code{--refactor} flag.")
(license license:bsd-3)))
;; In Stackage LTS 14, this package is at 2.4.1.0. However, that
;; version requires version 2.4.1.0 of the 'Cabal' package, which is
;; provided by GHC 8.6.5 at version 2.4.0.1. Hence, we use an older
;; version to match the compiler's library.
;; cabal-install depends on Cabal, which is part of GHC. You can only
;; update this packages after updating GHC.
(define-public cabal-install
(package
(name "cabal-install")
(version "2.4.0.0")
(version "3.2.0.0")
(source
(origin
(method url-fetch)
@ -107,19 +106,16 @@ library. It is primarily used with HLint's @code{--refactor} flag.")
version
".tar.gz"))
(sha256
(base32 "1xmyl0x8wqfrnray6ky5wy0g0samv4264fbdlzxhqsvk9dbfja8k"))))
(base32 "1c0cc256bha97aj7l0lf76l5swlnmwcqppiz8l4cl5xgba4mwmd0"))))
(build-system haskell-build-system)
(arguments
`(#:cabal-revision
("2" "1xil5pim6j1ckqj61zz6l7xpfxxr3rkw2hvpws2f7pr9shk645dl")
#:phases
`(#:phases
(modify-phases %standard-phases
(add-before 'configure 'update-constraints
(lambda _
(substitute* "cabal-install.cabal"
(("zip-archive >= 0\\.3\\.2\\.5 && < 0\\.4,")
"zip-archive >= 0.3.2.5 && <= 0.4.1,"))
#t)))))
(("(base|base16-bytestring|random)\\s+[^,]+" all dep)
dep)))))))
(inputs
`(("ghc-async" ,ghc-async)
("ghc-base16-bytestring" ,ghc-base16-bytestring)
@ -144,41 +140,10 @@ Haskell software by automating the fetching, configuration, compilation and
installation of Haskell libraries and programs.")
(license license:bsd-3)))
(define-public corrode
(let ((revision "0")
(commit "b6699fb2fa552a07c6091276285a44133e5c9789"))
(package
(name "corrode")
(version (git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/jameysharp/corrode")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "02v0yyj6sk4gpg2222wzsdqjxn8w66scbnf6b20x0kbmc69qcz4r"))))
(build-system haskell-build-system)
(inputs
`(("ghc-language-c" ,ghc-language-c)
("ghc-markdown-unlit" ,ghc-markdown-unlit)))
(home-page "https://github.com/jameysharp/corrode")
(synopsis "Automatic semantics-preserving translation from C to Rust")
(description
"This program reads a C source file and prints an equivalent module in
Rust syntax. It is intended to be useful for two different purposes:
@enumerate
@item Partial automation for migrating legacy code that was implemented in C.
@item A new, complementary approach to static analysis for C programs.
@end enumerate\n")
(license license:gpl2+))))
(define-public cpphs
(package
(name "cpphs")
(version "1.20.8")
(version "1.20.9.1")
(source
(origin
(method url-fetch)
@ -187,7 +152,7 @@ Rust syntax. It is intended to be useful for two different purposes:
name "-" version ".tar.gz"))
(sha256
(base32
"1bh524asqhk9v1s0wvipl0hgn7l63iy3js867yv0z3h5v2kn8vg5"))))
"17wi7fma2qaqdm1hwgaam3fd140v9bpa8ky0wg708h1pqc5v2nbz"))))
(build-system haskell-build-system)
(inputs
`(("ghc-polyparse" ,ghc-polyparse)
@ -210,7 +175,7 @@ unlit literate code files; and an option to turn off macro-expansion.")
(define-public darcs
(package
(name "darcs")
(version "2.14.2")
(version "2.16.4")
(source
(origin
(method url-fetch)
@ -218,7 +183,7 @@ unlit literate code files; and an option to turn off macro-expansion.")
"darcs-" version ".tar.gz"))
(sha256
(base32
"0zm2486gyhiga1amclbg92cd09bvki6vgh0ll75hv5kl72j61lb5"))
"07dygwh6p4fsrlgxmq6r7yvxmf4n2y04izzd30jzqgs0pi9645p4"))
(modules '((guix build utils)))
;; Remove time-dependent code for reproducibility.
(snippet
@ -229,8 +194,7 @@ unlit literate code files; and an option to turn off macro-expansion.")
#t))))
(build-system haskell-build-system)
(arguments
`(#:cabal-revision
("1" "0xl7j5cm704pbl2ms0dkydh7jvrz0ym76d725ifpg4h902m1zkhg")
`(#:tests? #f ; TODO: Needs QuickCheck ==2.13.*, and more…
#:configure-flags '("-fpkgconfig" "-fcurl" "-flibiconv" "-fthreaded"
"-fnetwork-uri" "-fhttp" "--flag=executable"
"--flag=library")
@ -244,9 +208,10 @@ unlit literate code files; and an option to turn off macro-expansion.")
(add-before 'configure 'update-constraints
(lambda _
(substitute* "darcs.cabal"
(("QuickCheck >= 2\\.8\\.2 && < 2\\.13,")
"QuickCheck >= 2.8.2 && < 2.14,"))
#t)))))
(("(constraints)\\s+[^,]+" all dep)
dep)
(("(cryptonite)\\s+[^,]+" all dep)
dep)))))))
(inputs
`(("ghc-cmdargs" ,ghc-cmdargs)
("ghc-split" ,ghc-split)
@ -254,8 +219,12 @@ unlit literate code files; and an option to turn off macro-expansion.")
("ghc-test-framework-hunit" ,ghc-test-framework-hunit)
("ghc-test-framework" ,ghc-test-framework)
("ghc-quickcheck" ,ghc-quickcheck)
("ghc-constraints" ,ghc-constraints)
("ghc-findbin" ,ghc-findbin)
("ghc-hunit" ,ghc-hunit)
("ghc-cryptonite" ,ghc-cryptonite)
("ghc-http-conduit" ,ghc-http-conduit)
("ghc-http-types" ,ghc-http-types)
("ghc-async" ,ghc-async)
("ghc-attoparsec" ,ghc-attoparsec)
("ghc-base16-bytestring" ,ghc-base16-bytestring)
@ -525,7 +494,7 @@ used to keep a folder in sync between computers.")
(define-public hlint
(package
(name "hlint")
(version "2.1.26")
(version "3.2.7")
(source
(origin
(method url-fetch)
@ -534,24 +503,25 @@ used to keep a folder in sync between computers.")
"/" name "-" version ".tar.gz"))
(sha256
(base32
"16zkkpbfrd69853cdqf597fva969lirfc86b039i9zd7ghlrcayc"))))
"0z6gxndrh7blzapkdn6fq1pkbkjlmbgjbq9ydnvy2wm00fb3v73g"))))
(build-system haskell-build-system)
(inputs
`(("cpphs" ,cpphs)
("ghc-unordered-containers" ,ghc-unordered-containers)
`(("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-yaml" ,ghc-yaml)
("ghc-vector" ,ghc-vector)
("ghc-data-default" ,ghc-data-default)
("ghc-file-embed" ,ghc-file-embed)
("ghc-utf8-string" ,ghc-utf8-string)
("cpphs" ,cpphs)
("ghc-filepattern" ,ghc-filepattern)
("ghc-lib-parser-ex" ,ghc-lib-parser-ex)
("hscolour" ,hscolour)
("ghc-cmdargs" ,ghc-cmdargs)
("ghc-haskell-src-exts" ,ghc-haskell-src-exts)
("ghc-haskell-src-exts-util" ,ghc-haskell-src-exts-util)
("ghc-uniplate" ,ghc-uniplate)
("ghc-ansi-terminal" ,ghc-ansi-terminal)
("ghc-extra" ,ghc-extra)
("ghc-refact" ,ghc-refact)
("ghc-aeson" ,ghc-aeson)
("ghc-lib-parser" ,ghc-lib-parser)
("hscolour" ,hscolour)))
("ghc-aeson" ,ghc-aeson)))
(home-page "https://github.com/ndmitchell/hlint")
(synopsis "Suggest improvements for Haskell source code")
(description "HLint reads Haskell programs and suggests changes that
@ -562,7 +532,7 @@ unwanted suggestions, and to add your own custom suggestions.")
(define-public hoogle
(package
(name "hoogle")
(version "5.0.17.11")
(version "5.0.18.2")
(source
(origin
(method url-fetch)
@ -572,7 +542,7 @@ unwanted suggestions, and to add your own custom suggestions.")
version ".tar.gz"))
(sha256
(base32
"1svp8z9pad8z2j386pr0dda0ds8ddxab0salnz4gm51q877w93p1"))))
"1xacx2f33x1a4qlv25f8rlmb4wi0cjfzrj22nlnkrd0knghik3m7"))))
(build-system haskell-build-system)
(inputs
`(("ghc-quickcheck" ,ghc-quickcheck)
@ -716,7 +686,14 @@ Wayland, and Linux console environments alike.")
("ghc-safe-exceptions" ,ghc-safe-exceptions)))
(arguments
`(#:cabal-revision
("1" "1hsj0jh6siph3afd9c2wii09sffl48rzqv653n4clpd8qy0rn48d")))
("1" "1hsj0jh6siph3afd9c2wii09sffl48rzqv653n4clpd8qy0rn48d")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'update-constraints
(lambda _
(substitute* "nixfmt.cabal"
(("(base|megaparsec)\\s+[^,]+" all dep)
dep)))))))
(home-page "https://github.com/serokell/nixfmt")
(synopsis "Opinionated formatter for Nix")
(description
@ -749,7 +726,7 @@ formatting by forgetting all existing formatting during parsing.")
("ghc-hashable" ,ghc-hashable)
("ghc-microlens" ,ghc-microlens)
("ghc-microlens-mtl" ,ghc-microlens-mtl)
("ghc-protolude" ,ghc-protolude-0.3)
("ghc-protolude" ,ghc-protolude)
("ghc-vector" ,ghc-vector)
("ghc-wordexp" ,ghc-wordexp)))
(home-page "https://github.com/erebe/greenclip")
@ -848,7 +825,7 @@ too slow and you'll get wound up in the scroll and crushed.")
(define-public shellcheck
(package
(name "shellcheck")
(version "0.7.1")
(version "0.7.2")
(source
(origin
(method url-fetch)
@ -856,11 +833,12 @@ too slow and you'll get wound up in the scroll and crushed.")
"https://hackage.haskell.org/package/ShellCheck/ShellCheck-"
version ".tar.gz"))
(sha256
(base32 "06m4wh891nah3y0br4wh3adpsb16zawkb2ijgf1vcz61fznj6ps1"))
(base32 "0wl43njaq95l35y5mvipwp1db9vr551nz9wl0xy83j1x1kc38xgz"))
(file-name (string-append name "-" version ".tar.gz"))))
(build-system haskell-build-system)
(arguments
'(#:phases
'(#:haddock? #f ; TODO: Fails to build.
#:phases
(modify-phases %standard-phases
(add-after 'build 'build-man-page
(lambda _
@ -950,17 +928,17 @@ output, stderr, and exit status.")
(define-public stylish-haskell
(package
(name "stylish-haskell")
(version "0.9.2.2")
(version "0.13.0.0")
(source
(origin
(method url-fetch)
(uri
(string-append
"mirror://hackage/package/stylish-haskell/"
"https://hackage.haskell.org/package/stylish-haskell/"
"stylish-haskell-" version ".tar.gz"))
(sha256
(base32
"1zs624xqp6j8vrl6pfv18dm8vz8hvz25grri65ximxhcizgwhnax"))))
"0x9w3zh1lzp6l5xj3mynnlr0fzb5mbv0wwpfxp8fr6bk0jcrzjwf"))))
(build-system haskell-build-system)
(inputs
`(("ghc-aeson" ,ghc-aeson)
@ -968,7 +946,9 @@ output, stderr, and exit status.")
("ghc-haskell-src-exts" ,ghc-haskell-src-exts)
("ghc-semigroups" ,ghc-semigroups)
("ghc-syb" ,ghc-syb)
("ghc-yaml" ,ghc-yaml)
("ghc-hsyaml" ,ghc-hsyaml)
("ghc-hsyaml-aeson" ,ghc-hsyaml-aeson)
("ghc-lib-parser" ,ghc-lib-parser)
("ghc-strict" ,ghc-strict)
("ghc-optparse-applicative" ,ghc-optparse-applicative)
("ghc-hunit" ,ghc-hunit)

289
gnu/packages/haskell-check.scm
View File

@ -42,7 +42,7 @@
(define-public ghc-tasty-ant-xml
(package
(name "ghc-tasty-ant-xml")
(version "1.1.6")
(version "1.1.8")
(source
(origin
(method url-fetch)
@ -52,7 +52,7 @@
".tar.gz"))
(sha256
(base32
"13qqpl1prr9dda87dp45mqybay24n8rhxxgvpc9j34kh72g8j5qw"))))
"0h9mllhw9cd0rn34xhj8grwmbny7z7hpd8qmp9lfcdj0s4qx9vx8"))))
(build-system haskell-build-system)
(inputs
`(("ghc-generic-deriving" ,ghc-generic-deriving)
@ -72,7 +72,7 @@ framework.")
(define-public ghc-tasty-smallcheck
(package
(name "ghc-tasty-smallcheck")
(version "0.8.1")
(version "0.8.2")
(source
(origin
(method url-fetch)
@ -82,7 +82,7 @@ framework.")
".tar.gz"))
(sha256
(base32
"1n66ngzllf3xrlqykwszlkwsi96n5nkm7xbpfq7774vpvfnafjri"))))
"0csgwn3vch0jnpqyyfnrfjq4z0dpl67imh5a7byll3hhlyidgjym"))))
(build-system haskell-build-system)
(inputs
`(("ghc-tasty" ,ghc-tasty)
@ -98,7 +98,7 @@ Haskell test framework.")
(define-public ghc-tasty-quickcheck
(package
(name "ghc-tasty-quickcheck")
(version "0.10.1")
(version "0.10.1.2")
(source
(origin
(method url-fetch)
@ -107,7 +107,7 @@ Haskell test framework.")
"tasty-quickcheck-" version ".tar.gz"))
(sha256
(base32
"0k4vvd5vmrncv1s6gdf03l4xijwlk428sb9jfx8n1zaz02971msh"))))
"0i1i78587znqzwps49milyr5n2k388ld2kr9ysz1vw8gcw51qq49"))))
(build-system haskell-build-system)
(inputs
`(("ghc-quickcheck" ,ghc-quickcheck)
@ -126,7 +126,7 @@ Haskell test framework.")
(define-public ghc-tasty-golden
(package
(name "ghc-tasty-golden")
(version "2.3.2")
(version "2.3.4")
(source
(origin
(method url-fetch)
@ -136,16 +136,16 @@ Haskell test framework.")
".tar.gz"))
(sha256
(base32
"0k3ibjhjc9vcwzrjnl4rnwvfm8l81q347nb7dgvcib6n5wm3s404"))))
"1nskavqgfxx1cw7q6c0cmizlwj54rnlv93yhgssaa77gv1nbvwpn"))))
(build-system haskell-build-system)
(inputs
`(("ghc-temporary" ,ghc-temporary)
("ghc-tasty" ,ghc-tasty)
`(("ghc-async" ,ghc-async)
("ghc-optparse-applicative" ,ghc-optparse-applicative)
("ghc-tagged" ,ghc-tagged)
("ghc-async" ,ghc-async)
("ghc-tasty-hunit" ,ghc-tasty-hunit)
("ghc-temporary-rc" ,ghc-temporary-rc)))
("ghc-tasty" ,ghc-tasty)
("ghc-temporary" ,ghc-temporary)
("ghc-unix-compat" ,ghc-unix-compat)))
(native-inputs `(("ghc-tasty-hunit" ,ghc-tasty-hunit)))
(home-page
"https://github.com/feuerbach/tasty-golden")
(synopsis "Golden tests support for tasty")
@ -159,7 +159,7 @@ contains the correct result for the test.")
(define-public ghc-tasty
(package
(name "ghc-tasty")
(version "1.2.3")
(version "1.4.2")
(source
(origin
(method url-fetch)
@ -169,7 +169,7 @@ contains the correct result for the test.")
".tar.gz"))
(sha256
(base32
"0qpn0avpw4w1qq5r2gwh2piipj0llqq6ylagr3xnqiraq6mhg8cc"))))
"0574hbqzxzyv6vsk5kzbf04kz58y0iy8x9ydcj4b8fpncgmgy63g"))))
(build-system haskell-build-system)
(inputs
`(("ghc-tagged" ,ghc-tagged)
@ -190,7 +190,7 @@ and any other types of tests into a single test suite.")
(define-public ghc-tasty-hedgehog
(package
(name "ghc-tasty-hedgehog")
(version "1.0.0.1")
(version "1.1.0.0")
(source
(origin
(method url-fetch)
@ -198,7 +198,7 @@ and any other types of tests into a single test suite.")
"tasty-hedgehog/tasty-hedgehog-" version ".tar.gz"))
(sha256
(base32
"1mbg5q0c0xfrk4npfj60pi693igb7r5l78x6xf9fk2jglw0nmxhz"))))
"0cy49z8n124xh2ra2482vfy5if1n6d9lbdjma2zg1mxfj0k0zyfb"))))
(build-system haskell-build-system)
(inputs
`(("ghc-tagged" ,ghc-tagged)
@ -206,9 +206,6 @@ and any other types of tests into a single test suite.")
("ghc-hedgehog" ,ghc-hedgehog)))
(native-inputs
`(("ghc-tasty-expected-failure" ,ghc-tasty-expected-failure)))
(arguments
`(#:cabal-revision
("1" "1n6797fm8swyrk8cw7zxz593gq82wx8dayvm204rmgcz75bslcpn")))
(home-page "https://github.com/qfpl/tasty-hedgehog")
(synopsis "Integration for tasty and hedgehog")
(description "This package provides the means for integrating the
@ -220,28 +217,29 @@ framework}.")
(define-public ghc-tasty-hspec
(package
(name "ghc-tasty-hspec")
(version "1.1.5.1")
(version "1.1.6")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://hackage/package/tasty-hspec/tasty-hspec-"
"https://hackage.haskell.org/package/tasty-hspec/tasty-hspec-"
version
".tar.gz"))
(sha256
(base32
"0i9kdzjpk750sa078jj3iyhp72k0177zk7vxl131r6dkyz09x27y"))))
"02s82ijs2ringqxsqbm7m3vcy5brmwxa617azxv0v2phi3rdkjvl"))))
(build-system haskell-build-system)
(inputs
`(("ghc-hspec" ,ghc-hspec)
("ghc-hspec-core" ,ghc-hspec-core)
("ghc-quickcheck" ,ghc-quickcheck)
("ghc-tagged" ,ghc-tagged)
("ghc-tasty" ,ghc-tasty)
("ghc-tasty-smallcheck" ,ghc-tasty-smallcheck)
("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)))
(arguments
`(#:cabal-revision
("4" "1yppwhs2r2rlwrzli9ccv5ldgl95h5p7pqhsr898r3das6daf6sk")))
("1" "0za15rg0szacxq9yfxxjzddr77ai7ng5827a20pj9dr5anjlnajj")))
(home-page
"https://github.com/mitchellwrosen/tasty-hspec")
(synopsis
@ -253,7 +251,7 @@ framework}.")
(define-public ghc-tasty-hunit
(package
(name "ghc-tasty-hunit")
(version "0.10.0.2")
(version "0.10.0.3")
(source
(origin
(method url-fetch)
@ -263,7 +261,7 @@ framework}.")
".tar.gz"))
(sha256
(base32
"1xvf5xs0r8xqkcg354klz4wyzwyzvinalyl6f4fnxwqmzrgch8s8"))))
"0gz6zz3w7s44pymw33xcxnawryl27zk33766sab96nz2xh91kvxp"))))
(build-system haskell-build-system)
(inputs
`(("ghc-call-stack" ,ghc-call-stack-boot)
@ -300,7 +298,7 @@ tasty.")
(define-public ghc-tasty-lua
(package
(name "ghc-tasty-lua")
(version "0.2.0.1")
(version "0.2.3.2")
(source
(origin
(method url-fetch)
@ -308,7 +306,7 @@ tasty.")
"tasty-lua/tasty-lua-" version ".tar.gz"))
(sha256
(base32
"0xlj36rrhkx312h7smx6ay20rhlhxvw2ma2ckdnzv1pvmdn6p5qx"))))
"0wa73ihkjcxi50lgpdzwwdx7s903lqi79hw7hxlvhbcvdly1cq53"))))
(build-system haskell-build-system)
(inputs
`(("ghc-file-embed" ,ghc-file-embed)
@ -352,7 +350,7 @@ test-framework.")
(define-public ghc-tasty-rerun
(package
(name "ghc-tasty-rerun")
(version "1.1.14")
(version "1.1.18")
(source (origin
(method url-fetch)
(uri (string-append
@ -360,7 +358,7 @@ test-framework.")
"tasty-rerun-" version ".tar.gz"))
(sha256
(base32
"0s0zj8ds4g1w2cjzm2lh25ivg962jigqdrbj08v3dbz64lx4mlzr"))))
"0sccp5zx9v2rx741nbmgd8mzjhy5m4v74hk26d23xz93ph8aqx7s"))))
(build-system haskell-build-system)
(inputs
`(("ghc-optparse-applicative" ,ghc-optparse-applicative)
@ -379,7 +377,7 @@ been added since previous test run.")
(define-public ghc-tasty-expected-failure
(package
(name "ghc-tasty-expected-failure")
(version "0.11.1.2")
(version "0.12.3")
(source
(origin
(method url-fetch)
@ -388,11 +386,18 @@ been added since previous test run.")
version ".tar.gz"))
(sha256
(base32
"175gdk1mkslcwjxajkbl4zmaigzf8h4svzd7va5qb519y0dxk28n"))))
"0zlgxs24d54byfhvwdg85xk1572zpjs71bjlxxrxcvralrfcq1yb"))))
(build-system haskell-build-system)
(arguments `(#:tests? #f)) ; TODO: Loops.
; (native-inputs
; `(("ghc-tasty-hunit" ,ghc-tasty-hunit)
; ("ghc-tasty-golden" ,ghc-tasty-golden)
; ("ghc-hedgehog" ,ghc-hedgehog)
; ("ghc-tasty-hedgehog" ,ghc-tasty-hedgehog)))
(inputs
`(("ghc-tagged" ,ghc-tagged)
("ghc-tasty" ,ghc-tasty)))
("ghc-tasty" ,ghc-tasty)
("ghc-unbounded-delays" ,ghc-unbounded-delays)))
(home-page "https://github.com/nomeata/tasty-expected-failure")
(synopsis "Mark tasty tests as failure expected")
(description
@ -405,7 +410,7 @@ development.")
(define-public ghc-quickcheck-instances
(package
(name "ghc-quickcheck-instances")
(version "0.3.22")
(version "0.3.25.2")
(source
(origin
(method url-fetch)
@ -415,19 +420,23 @@ development.")
version ".tar.gz"))
(sha256
(base32
"14asr9r7da3w7p4hjj51w2yb002nz8x0np8hdz9z4yjvi60vyrax"))))
"0ihqbarl2ddrfgq3mq09lswwn8213qpw13g49qxs5mjkcm6gbk3h"))))
(build-system haskell-build-system)
(arguments
`(#:cabal-revision
("2" "1ia5fjhpg7rz793552v88gv2iqx7hl9mi2g09m0llasy1cpzc9jr")))
("2" "1lsa3pbg4ljlk29fhm3mdklnx3hwffyga1nr5krbpcyc3ywq8fq8")))
(inputs
`(("ghc-quickcheck" ,ghc-quickcheck)
("ghc-base-compat" ,ghc-base-compat)
("ghc-case-insensitive" ,ghc-case-insensitive)
`(("ghc-case-insensitive" ,ghc-case-insensitive)
("ghc-data-fix" ,ghc-data-fix)
("ghc-hashable" ,ghc-hashable)
("ghc-integer-logarithms" ,ghc-integer-logarithms)
("ghc-old-time" ,ghc-old-time)
("ghc-quickcheck" ,ghc-quickcheck)
("ghc-scientific" ,ghc-scientific)
("ghc-splitmix" ,ghc-splitmix)
("ghc-strict" ,ghc-strict)
("ghc-tagged" ,ghc-tagged)
("ghc-these" ,ghc-these)
("ghc-time-compat" ,ghc-time-compat)
("ghc-transformers-compat" ,ghc-transformers-compat)
("ghc-unordered-containers" ,ghc-unordered-containers)
@ -489,8 +498,7 @@ use HUnit assertions as QuickCheck properties.")
(define-public ghc-quickcheck
(package
(name "ghc-quickcheck")
(version "2.13.2")
(outputs '("out" "static" "doc"))
(version "2.14.2")
(source
(origin
(method url-fetch)
@ -500,7 +508,7 @@ use HUnit assertions as QuickCheck properties.")
".tar.gz"))
(sha256
(base32
"0426j43af8v3qmdjjqxivazsvr3a2brac8yw09vpgpjkb2m0nmkv"))))
"1wrnrm9sq4s0bly0q58y80g4153q45iglqa34xsi2q3bd62nqyyq"))))
(build-system haskell-build-system)
(inputs
`(("ghc-random" ,ghc-random)
@ -558,7 +566,7 @@ HUnit.")
(arguments
`(#:tests? #f ; FIXME: Tests do not build.
#:cabal-revision
("5" "18g92ajx3ghznd6k3ihj22ln29n676ailzwx3k0f1kj3bmpilnh6")))
("6" "0wbq9wiaag69nsqxwijzhs5y1hb9kbpkp1x65dvx158cxp8i9w9r")))
(native-inputs
`(("ghc-hunit" ,ghc-hunit)
("ghc-quickcheck" ,ghc-quickcheck)))
@ -625,7 +633,7 @@ reporting and test statistics output.")
(build-system haskell-build-system)
(arguments
`(#:cabal-revision
("1" "1vmpk70h1594h9s216d3ngkb399fpny1d3sh4gg0vrc75p4as68d")))
("3" "0mglqfimla4vvv80mg08aj76zf4993wmngqlirh05h8i9nmgv6lh")))
(inputs
`(("ghc-extensible-exceptions" ,ghc-extensible-exceptions)
("ghc-quickcheck" ,ghc-quickcheck)
@ -698,7 +706,7 @@ using Template Haskell")
(define-public ghc-hunit
(package
(name "ghc-hunit")
(version "1.6.0.0")
(version "1.6.2.0")
(outputs '("out" "static" "doc"))
(source
(origin
@ -707,7 +715,7 @@ using Template Haskell")
"HUnit-" version ".tar.gz"))
(sha256
(base32
"1pnhwqq5v8h48gbp3ibv3skfj25mf4zs5svxcavq93p9cswycj3l"))))
"1as4sw5y39c3zrmr6sb8zbw74c9gdn4401y0dx45ih7zf6457dxh"))))
(build-system haskell-build-system)
(inputs
;; We cannot use ghc-call-stack there, because it depends on
@ -723,7 +731,7 @@ JUnit tool for Java.")
(define-public hspec-discover
(package
(name "hspec-discover")
(version "2.7.1")
(version "2.7.10")
(source
(origin
(method url-fetch)
@ -732,7 +740,7 @@ JUnit tool for Java.")
version ".tar.gz"))
(sha256
(base32
"0r47fm94wa6qrhp8cc1zzkjrxc32rnagfn9m9ga4dm6p6ydw4c8b"))))
"13yzvd3b679skvs1insk4s0wc4zvmz6hs38kc8q0j6vzqq06smqa"))))
(build-system haskell-build-system)
(native-inputs
`(("ghc-quickcheck" ,ghc-quickcheck)
@ -746,7 +754,7 @@ runs Hspec tests.")
(define-public ghc-hspec-core
(package
(name "ghc-hspec-core")
(version "2.7.1")
(version "2.7.10")
(source
(origin
(method url-fetch)
@ -754,7 +762,7 @@ runs Hspec tests.")
"hspec-core-" version ".tar.gz"))
(sha256
(base32
"08vk8588lap00hsln8zl64dazbb28lzk4b4h5vnm7xvhg7r21k1c"))))
"12k9yp5gznrda449ir60d5wv3xl7nnyffkb5mhfc0svw9f8lxlv1"))))
(build-system haskell-build-system)
(arguments `(#:tests? #f)) ; FIXME: testing libraries are missing.
(inputs
@ -776,7 +784,7 @@ be used to extend Hspec's functionality.")
(define-public ghc-hspec-meta
(package
(name "ghc-hspec-meta")
(version "2.6.0")
(version "2.7.8")
(source
(origin
(method url-fetch)
@ -784,7 +792,7 @@ be used to extend Hspec's functionality.")
"hspec-meta-" version ".tar.gz"))
(sha256
(base32
"1n1a4633wfivylglji8920f67mx7qz8j4q58n8p7dxk6yg4h3mz6"))))
"0sfj0n2hy1r8ifysgbcmfdygcd7vyzr13ldkcp0l2ml337f8j0si"))))
(build-system haskell-build-system)
(inputs
`(("ghc-quickcheck" ,ghc-quickcheck)
@ -804,7 +812,7 @@ used to test the in-development version of Hspec.")
(define-public ghc-hspec
(package
(name "ghc-hspec")
(version "2.7.1")
(version "2.7.10")
(source
(origin
(method url-fetch)
@ -812,7 +820,7 @@ used to test the in-development version of Hspec.")
"hspec-" version ".tar.gz"))
(sha256
(base32
"1x8rcr7j1azcaw0fg1xzp8j0gr4ias36z09aj24i4xp8pnyfp341"))))
"0z0lwrmrqkglr78n6k2c36n4h68142bh785ys0x4jaibjshvs6rw"))))
(build-system haskell-build-system)
(outputs '("out" "static" "doc"))
(inputs
@ -934,24 +942,24 @@ implementations of cryptographic ciphers.")
(define-public ghc-hedgehog
(package
(name "ghc-hedgehog")
(version "1.0.1")
(version "1.0.5")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://hackage/package/hedgehog/hedgehog-"
"https://hackage.haskell.org/package/hedgehog/hedgehog-"
version
".tar.gz"))
(sha256
(base32
"1qc7hkqbnsk3f5r26wc35r3qiy941nmcxhfqgcq9027kw4gs0bi0"))))
"1qsqs8lmxa3wmw228cwi98vvvh9hqbc9d43i1sy2c9igw9xlhfi6"))))
(build-system haskell-build-system)
(inputs
`(("ghc-ansi-terminal" ,ghc-ansi-terminal)
("ghc-async" ,ghc-async)
("ghc-concurrent-output" ,ghc-concurrent-output)
("ghc-exceptions" ,ghc-exceptions)
("ghc-fail" ,ghc-fail)
("ghc-erf" ,ghc-erf)
;("ghc-exceptions" ,ghc-exceptions)
("ghc-lifted-async" ,ghc-lifted-async)
("ghc-mmorph" ,ghc-mmorph)
("ghc-monad-control" ,ghc-monad-control)
@ -959,8 +967,6 @@ implementations of cryptographic ciphers.")
("ghc-primitive" ,ghc-primitive)
("ghc-random" ,ghc-random)
("ghc-resourcet" ,ghc-resourcet)
("ghc-semigroups" ,ghc-semigroups)
("ghc-th-lift" ,ghc-th-lift)
("ghc-transformers-base" ,ghc-transformers-base)
("ghc-wl-pprint-annotated"
,ghc-wl-pprint-annotated)))
@ -989,6 +995,9 @@ To get started quickly, see the examples:
(base32
"03if74imlhhk7m56nci5f1wclniwqdmwl4hl177040j1gnlac9i0"))))
(build-system haskell-build-system)
(arguments
`(#:cabal-revision
("2" "05v1awad3d1wvc763xcgvxm4n6n7bs7byc6s14kdbw35zcaddlcb")))
(home-page "https://github.com/phadej/cabal-doctest")
(synopsis "Setup.hs helper for running doctests")
(description
@ -1050,7 +1059,7 @@ random testing, and hybrids of the two.")
(define-public ghc-inspection-testing
(package
(name "ghc-inspection-testing")
(version "0.4.2.2")
(version "0.4.6.0")
(source
(origin
(method url-fetch)
@ -1059,7 +1068,7 @@ random testing, and hybrids of the two.")
"inspection-testing-" version ".tar.gz"))
(sha256
(base32
"1bppz99p6ix6hah8lbr9mapl2zxgmkg9i7h6hk8wq6zf54hwz3yp"))))
"0qz1npyycj4bvyly9xmjbnhw569l52h38gx02rk0r7zhapw83aig"))))
(build-system haskell-build-system)
(home-page
"https://github.com/nomeata/inspection-testing")
@ -1087,28 +1096,150 @@ See the documentation in \"Test.Inspection\" or the project webpage for more
examples and more information.")
(license license:expat)))
(define-public ghc-easytest
(define-public ghc-quickcheck-classes-base
(package
(name "ghc-easytest")
(version "0.2.1")
(name "ghc-quickcheck-classes-base")
(version "0.6.2.0")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/easytest/easytest-"
version ".tar.gz"))
"https://hackage.haskell.org/package/quickcheck-classes-base/quickcheck-classes-base-"
version
".tar.gz"))
(sha256
(base32
"0gdyawzlw6d15yz7ji599xjgfr0g7l1iq11ffr4aw3j6g3dc6m8i"))))
(base32 "16c6gq4cqpkwnq1pzkhm6r7mrwk4an50ha5w77bmiia2qkhla6ch"))))
(build-system haskell-build-system)
(inputs
`(("ghc-async" ,ghc-async)
("ghc-random" ,ghc-random)
("ghc-call-stack" ,ghc-call-stack)))
(home-page "https://github.com/joelburget/easytest")
(synopsis "Testing library for Haskell")
(description "EasyTest is a testing toolkit, meant to replace most uses of
QuickCheck, SmallCheck, HUnit, and frameworks like Tasty, etc. Tests can be
written with ordinary Haskell code, with control flow explicit and under
programmer control.")
`(("ghc-quickcheck" ,ghc-quickcheck)
("ghc-contravariant" ,ghc-contravariant)
("ghc-bifunctors" ,ghc-bifunctors)
("ghc-semigroups" ,ghc-semigroups)
("ghc-fail" ,ghc-fail)
("ghc-tagged" ,ghc-tagged)))
(home-page "https://github.com/andrewthad/quickcheck-classes#readme")
(synopsis "QuickCheck common typeclasses from `base`")
(description
"This libary is a minimal variant of `quickcheck-classes`
that only provides laws for typeclasses from `base`. The main
purpose of splitting this out is so that `primitive` can depend
on `quickcheck-classes-base` in its test suite, avoiding the
circular dependency that arises if `quickcheck-classes` is used
instead. . This library provides QuickCheck properties to ensure
that typeclass instances adhere to the set of laws that they are
supposed to. There are other libraries that do similar things,
such as `genvalidity-hspec` and `checkers`. This library differs
from other solutions by not introducing any new typeclasses that
the user needs to learn. . /Note:/ on GHC < 8.5, this library
uses the higher-kinded typeclasses ('Data.Functor.Classes.Show1',
'Data.Functor.Classes.Eq1', 'Data.Functor.Classes.Ord1', etc.),
but on GHC >= 8.5, it uses `-XQuantifiedConstraints` to express
these constraints more cleanly.")
(license license:bsd-3)))
(define-public ghc-doctest-lib
(package
(name "ghc-doctest-lib")
(version "0.1")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/doctest-lib/doctest-lib-"
version
".tar.gz"))
(sha256
(base32 "1vswam0dhw52dihgnzirh18gqs8rj8h6jd7pl6y1mg2f9f9zmih2"))))
(build-system haskell-build-system)
(home-page "https://hub.darcs.net/thielema/doctest-lib/")
(synopsis "Parts of doctest exposed as library")
(description
"Parts of doctest exposed as library. For use with the doctest-extract utility.")
(license license:expat)))
(define-public ghc-doctest-exitcode-stdio
(package
(name "ghc-doctest-exitcode-stdio")
(version "0.0")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/doctest-exitcode-stdio/doctest-exitcode-stdio-"
version
".tar.gz"))
(sha256
(base32 "1g3c7yrqq2mwqbmvs8vkx1a3cf0p0x74b7fnn344dsk7bsfpgv0x"))))
(build-system haskell-build-system)
(inputs
`(("ghc-doctest-lib" ,ghc-doctest-lib)
("ghc-quickcheck" ,ghc-quickcheck)
("ghc-semigroups" ,ghc-semigroups)))
(home-page "https://hub.darcs.net/thielema/doctest-exitcode-stdio/")
(synopsis "Run Doctests in a @code{Cabal.Test.exitcode-stdio} environment")
(description
"This package allows on to run Doctests in a Cabal.Test.exitcode-stdio
environment.")
(license license:bsd-3)))
(define-public ghc-cabal-doctest
(package
(name "ghc-cabal-doctest")
(version "1.0.8")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/cabal-doctest/cabal-doctest-"
version
".tar.gz"))
(sha256
(base32 "03if74imlhhk7m56nci5f1wclniwqdmwl4hl177040j1gnlac9i0"))))
(build-system haskell-build-system)
(arguments
`(#:cabal-revision
("2" "05v1awad3d1wvc763xcgvxm4n6n7bs7byc6s14kdbw35zcaddlcb")))
(home-page "https://github.com/phadej/cabal-doctest")
(synopsis "@file{Setup.hs} helper for Doctests running")
(description
"This package provides helpers for running Doctests in @file{Setup.hs}.")
(license license:bsd-3)))
(define-public ghc-tasty-silver
(package
(name "ghc-tasty-silver")
(version "3.2.2")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/tasty-silver/tasty-silver-"
version
".tar.gz"))
(sha256
(base32 "0zsl6nna8ir215qyxhyh2czx4i16hzw1n1m8jw8ym02j6sp6iz13"))))
(build-system haskell-build-system)
(inputs
`(("ghc-ansi-terminal" ,ghc-ansi-terminal)
("ghc-async" ,ghc-async)
("ghc-optparse-applicative" ,ghc-optparse-applicative)
("ghc-process-extras" ,ghc-process-extras)
("ghc-regex-tdfa" ,ghc-regex-tdfa)
("ghc-tagged" ,ghc-tagged)
("ghc-tasty" ,ghc-tasty)
("ghc-temporary" ,ghc-temporary)))
(native-inputs `(("ghc-tasty-hunit" ,ghc-tasty-hunit)))
(arguments
`(#:cabal-revision
("1" "0mgdk77xz38zc46qbxvss6vnp4yk328zbpw1l0c1n0f5gyf6sbav")))
(home-page "https://github.com/phile314/tasty-silver")
(synopsis "Fancy test runner, including support for golden tests")
(description
"This package provides a fancy test runner and support for @dfn{golden
testing}. A golden test is an IO action that writes its result to a file. To
pass the test, this output file should be identical to the corresponding
``golden'' file, which contains the correct result for the test. The test
runner allows filtering tests using regexes, and to interactively inspect the
result of golden tests.")
(license license:expat)))

51
gnu/packages/haskell-crypto.scm
View File

@ -37,7 +37,7 @@
(define-public ghc-asn1-types
(package
(name "ghc-asn1-types")
(version "0.3.3")
(version "0.3.4")
(source (origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
@ -45,7 +45,7 @@
version ".tar.gz"))
(sha256
(base32
"162lacdl9jr42pdhaj9hxqlba6hjxm6g866anna74q6v3cvw5ssp"))))
"1a119qxhxhr0yn37r26dkydm6g5kykdkx98ghb59i4ipa6i95vkq"))))
(build-system haskell-build-system)
(inputs
`(("ghc-memory" ,ghc-memory)
@ -214,7 +214,7 @@ that hides the C implementation.")
(build-system haskell-build-system)
(arguments
`(#:cabal-revision
("4" "0gzaibjkipijwj9m9l6wrhfk5s3kdvfbhdl7cl1373cjfs41v0m3")
("6" "191nvffcrlyvr5dq99bbdxxl2qx44bla9adkhklyknf7ipqdd4yj")
#:tests? #f)) ; tests require old version of ghc-hunit (0.9)
(native-inputs `(("ghc-base16-bytestring" ,ghc-base16-bytestring)
("ghc-puremd5" ,ghc-puremd5)
@ -242,7 +242,7 @@ that hides the C implementation.")
(build-system haskell-build-system)
(arguments
`(#:cabal-revision
("4" "0qb2wasfc4dpf6f9ahvhlv8njb3p3p9iwblg4032ssi95cg85718")
("6" "10rpxrmqgwihmplczglwxf5q3l13z9j3kvi065z884y4dymmnkgc")
#:tests? #f)) ; tests require old version of ghc-hunit (0.9)
(native-inputs `(("ghc-base16-bytestring" ,ghc-base16-bytestring)
("ghc-sha" ,ghc-sha)
@ -263,7 +263,7 @@ the C implementation.")
(define-public ghc-cryptohash-sha256
(package
(name "ghc-cryptohash-sha256")
(version "0.11.101.0")
(version "0.11.102.0")
(source
(origin
(method url-fetch)
@ -272,19 +272,18 @@ the C implementation.")
"cryptohash-sha256-" version ".tar.gz"))
(sha256
(base32
"1p85vajcgw9hmq8zsz9krzx0vxh7aggwbg5w9ws8w97avcsn8xaj"))))
"0685s4hfighzywvvn05cfff5bl2xz3wq0pfncv6zca4iba3ykmla"))))
(build-system haskell-build-system)
(arguments
`(#:cabal-revision
("3" "1arhz4y792kx439s2zv9x291gvvl2zxcfx9sq0nxsjlz7c3hpyp1")
#:tests? #f)) ; tests require old version of ghc-hunit (0.9)
(inputs
`(("ghc-base16-bytestring" ,ghc-base16-bytestring)))
("1" "0v5ppc7r2lxbk49h1kwj4b5vyb1dw2fnppykvp5m9rm0p3vhlykr")
#:tests? #f)) ; TODO: tasty ==1.1.*
(native-inputs
`(("ghc-sha" ,ghc-sha)
`(("ghc-base16-bytestring" ,ghc-base16-bytestring)
("ghc-sha" ,ghc-sha)
("ghc-tasty" ,ghc-tasty)
("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)
("ghc-hunit" ,ghc-hunit)))
("ghc-tasty-hunit" ,ghc-tasty-hunit)
("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)))
(home-page "https://github.com/hvr/cryptohash-sha1")
(synopsis "SHA-256 implementation for Haskell")
(description "This Haskell package provides an incremental and
@ -299,7 +298,7 @@ the C implementation.")
(define-public ghc-cryptonite
(package
(name "ghc-cryptonite")
(version "0.25")
(version "0.29")
(source (origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
@ -307,7 +306,7 @@ the C implementation.")
version ".tar.gz"))
(sha256
(base32
"131wbbdr5yavs5k1ah9sz6fqx1ffyvaxf66pwjzsfc47mwc1mgl9"))))
"13xhp3hshb8x06bw37kp16c9jpjmgfn06nkj9drz745fv8f04fnq"))))
(build-system haskell-build-system)
;; FIXME: tests are broken.
;; See https://github.com/haskell-crypto/cryptonite/issues/260
@ -334,7 +333,7 @@ generators, and more.")
(define-public ghc-digest
(package
(name "ghc-digest")
(version "0.0.1.2")
(version "0.0.1.3")
(source
(origin
(method url-fetch)
@ -344,7 +343,7 @@ generators, and more.")
".tar.gz"))
(sha256
(base32
"04gy2zp8yzvv7j9bdfvmfzcz3sqyqa6rwslqcn4vyair2vmif5v4"))))
"1l5383l5pvp018rj3vabrppnzcqrr2g0dvgvmsrbjdn02wzab5jm"))))
(build-system haskell-build-system)
(arguments
`(#:extra-directories ("zlib")))
@ -363,7 +362,7 @@ are implemented as FFI bindings to efficient code from zlib.")
(define-public ghc-entropy
(package
(name "ghc-entropy")
(version "0.4.1.5")
(version "0.4.1.6")
(source
(origin
(method url-fetch)
@ -371,7 +370,7 @@ are implemented as FFI bindings to efficient code from zlib.")
"entropy-" version "/"
"entropy-" version ".tar.gz"))
(sha256
(base32 "0szf8hi1pi8g0kxnkcymh65gk1b0niyl1nnkckzdqyar87qal0jm"))))
(base32 "0qmzz0zgad13zl0kjrxz6cxg8ckn2w8saas2a2j72vbafpzmkixd"))))
(build-system haskell-build-system)
(home-page "https://github.com/TomMD/entropy")
(synopsis "Provides platform independent entropy source for Haskell")
@ -726,7 +725,7 @@ percent.
(build-system haskell-build-system)
(arguments
`(#:cabal-revision
("2" "1cq6h3jqkb1kvd9fjfhsllg5gq78sdiyf2gy9862xhlbv6wil19f")
("3" "1yidh86ymzwmp2b449pwim6vvfcs1qgkkncbixw1zmb7wj6v167v")
;; We omit these test suites because they require old versions of
;; packages and packages we do not have.
#:configure-flags
@ -743,14 +742,14 @@ guidelines.")
(define-public ghc-tls
(package
(name "ghc-tls")
(version "1.4.1")
(version "1.5.5")
(source (origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"tls/tls-" version ".tar.gz"))
(sha256
(base32
"1y083724mym28n6xfaz7pcc7zqxdhjpaxpbvzxfbs25qq2px3smv"))))
"0j1rxxq5lzs584nk19610mk7mmsqqkgfxw2qj74ibb1zsk7baj4a"))))
(build-system haskell-build-system)
(inputs
`(("ghc-cereal" ,ghc-cereal)
@ -785,7 +784,7 @@ extensions.")
(define-public ghc-hsopenssl
(package
(name "ghc-hsopenssl")
(version "0.11.4.17")
(version "0.11.7.1")
(source
(origin
(method url-fetch)
@ -793,7 +792,7 @@ extensions.")
"HsOpenSSL/HsOpenSSL-" version ".tar.gz"))
(sha256
(base32
"0qivl9clmybfglwxqp2sq308rv4ia4rhwshcsc8b029bvpp0mpsi"))))
"1vkcs0crifjpgr1rxkbzkwyhl4zg84m5bfxkp095mgry557gqzm8"))))
(build-system haskell-build-system)
(arguments
`(#:extra-directories ("openssl")))
@ -815,7 +814,7 @@ implementation of SSL.")
(define-public ghc-openssl-streams
(package
(name "ghc-openssl-streams")
(version "1.2.2.0")
(version "1.2.3.0")
(source
(origin
(method url-fetch)
@ -824,7 +823,7 @@ implementation of SSL.")
version ".tar.gz"))
(sha256
(base32
"0rplym6ayydkpr7x9mw3l13p0vzzfzzxw244d7sd3jcvaxpv0rmr"))))
"10pnnpzgb5xr811kc9qdk7h2cgn6hk2yiyhnzz8f8p0fjzc0pwjm"))))
(build-system haskell-build-system)
(inputs
`(("ghc-hsopenssl" ,ghc-hsopenssl)

272
gnu/packages/haskell-web.scm
View File

@ -71,7 +71,7 @@ for screen-scraping.")
(define-public ghc-cookie
(package
(name "ghc-cookie")
(version "0.4.4")
(version "0.4.5")
(source
(origin
(method url-fetch)
@ -81,7 +81,7 @@ for screen-scraping.")
".tar.gz"))
(sha256
(base32
"1qy09i0jh2z9i9avy2khf8a8afq4fqgnv0fyrszgfg4kmq2fsi9j"))))
"10rmdasb7mypbwxdj2mhr810vqhkakpik7hyd8fvj60hng8r8zvh"))))
(build-system haskell-build-system)
(inputs
`(("ghc-old-locale" ,ghc-old-locale)
@ -173,7 +173,7 @@ both client and server code).")
(define-public ghc-http
(package
(name "ghc-http")
(version "4000.3.14")
(version "4000.3.16")
(outputs '("out" "static" "doc"))
(source
(origin
@ -182,7 +182,7 @@ both client and server code).")
"HTTP-" version ".tar.gz"))
(sha256
(base32
"0yv8mbjicpl7l2017c4dhm49117lblgwpy1llv368wci1vrxf0m6"))))
"0bgyj3ahqlyg0jw6qsm2sncp8mklc4h0dj91s043vb3ig01iq2fn"))))
(build-system haskell-build-system)
(native-inputs
`(("ghc-httpd-shed" ,ghc-httpd-shed)
@ -228,7 +228,7 @@ responses coming back.")
(define-public ghc-http-client
(package
(name "ghc-http-client")
(version "0.6.4")
(version "0.6.4.1")
(source (origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
@ -236,7 +236,7 @@ responses coming back.")
version ".tar.gz"))
(sha256
(base32
"1n9rnbp8lwkd4whi2anniywi4y1bn9kx6nzfigfvz28d7pn7i4in"))))
"1y12xfh6xvsfvyapbssmgrpjz025rmyccprbnmzhs0y1cmlz6hjp"))))
(build-system haskell-build-system)
;; Tests require access to the web.
(arguments `(#:tests? #f))
@ -301,7 +301,7 @@ libraries, such as http-conduit.")
(define-public ghc-http-date
(package
(name "ghc-http-date")
(version "0.0.8")
(version "0.0.11")
(source
(origin
(method url-fetch)
@ -310,7 +310,7 @@ libraries, such as http-conduit.")
"http-date-" version ".tar.gz"))
(sha256
(base32
"09slbzqayjnqqz9zybk7slgzvizgplikqgg4b2flzgks91466k0g"))))
"1lzlrj2flcnz3k5kfhf11nk5n8m6kcya0lkwrsnzxgfr3an27y9j"))))
(build-system haskell-build-system)
(inputs
`(("ghc-attoparsec" ,ghc-attoparsec)))
@ -328,7 +328,7 @@ Date in Haskell.")
(define-public ghc-http2
(package
(name "ghc-http2")
(version "1.6.5")
(version "3.0.2")
(source
(origin
(method url-fetch)
@ -337,23 +337,31 @@ Date in Haskell.")
"http2-" version ".tar.gz"))
(sha256
(base32
"1vlmy8vnp6ml2n2pr11aa5fzigldsscgzmibrni64ykgfvpd3sqn"))))
"13c2z35gdimncgpyg5dn5cpjvd83rbrigc8b40crg36678m0k0d1"))))
(build-system haskell-build-system)
(inputs
`(("ghc-case-insensitive" ,ghc-case-insensitive)
("ghc-network-byte-order" ,ghc-network-byte-order)
("ghc-aeson" ,ghc-aeson)
`(("ghc-aeson" ,ghc-aeson)
("ghc-aeson-pretty" ,ghc-aeson-pretty)
("ghc-base16-bytestring" ,ghc-base16-bytestring)
("ghc-case-insensitive" ,ghc-case-insensitive)
("ghc-cryptonite" ,ghc-cryptonite)
("ghc-http-types" ,ghc-http-types)
("ghc-network-byte-order" ,ghc-network-byte-order)
("ghc-network" ,ghc-network)
("ghc-network-run" ,ghc-network-run)
("ghc-psqueues" ,ghc-psqueues)
("ghc-time-manager" ,ghc-time-manager)
("ghc-unix-time" ,ghc-unix-time)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-vector" ,ghc-vector)
("ghc-word8" ,ghc-word8)
("ghc-psqueues" ,ghc-psqueues)))
("ghc-word8" ,ghc-word8)))
(native-inputs
`(("ghc-glob" ,ghc-glob)
("ghc-hspec" ,ghc-hspec)
`(("ghc-async" ,ghc-async)
("ghc-doctest" ,ghc-doctest)
("hspec-discover" ,hspec-discover)))
("ghc-glob" ,ghc-glob)
("ghc-hspec" ,ghc-hspec)
("hspec-discover" ,hspec-discover)
("ghc-typed-process" ,ghc-typed-process)))
(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
@ -363,7 +371,7 @@ and HPACK. Currently HTTP/2 16 framing and HPACK 10 is supported.")
(define-public ghc-http-conduit
(package
(name "ghc-http-conduit")
(version "2.3.7.3")
(version "2.3.8")
(source
(origin
(method url-fetch)
@ -372,7 +380,7 @@ and HPACK. Currently HTTP/2 16 framing and HPACK 10 is supported.")
version ".tar.gz"))
(sha256
(base32
"00rshi1y0h8y4rvsnnad0bppxgpvp40sk7lw1kxmdwy8pi8xrvbs"))))
"1bj24phbcb7s3k6v48l5gk82m3m23j8zy9l7c5ccxp3ghn9z5gng"))))
(build-system haskell-build-system)
;; FIXME: `httpLbs TLS` in test-suite `test` fails with
;; ConnectionFailure getProtocolByName: does not exist (no such protocol
@ -464,7 +472,7 @@ approach performs full request/response parsing via WAI and http-conduit.")
(define-public ghc-wai
(package
(name "ghc-wai")
(version "3.2.2.1")
(version "3.2.3")
(source
(origin
(method url-fetch)
@ -474,7 +482,7 @@ approach performs full request/response parsing via WAI and http-conduit.")
".tar.gz"))
(sha256
(base32
"058871axlq6r0gcqxbjw37w57df9xbv81dmz99b1zq59wf329xzy"))))
"1y19h9v0cq1fl17ywcyyvd6419fhgyw2s0yk0ki8z60021adcx2m"))))
(build-system haskell-build-system)
(inputs
`(("ghc-bytestring-builder" ,ghc-bytestring-builder)
@ -498,7 +506,7 @@ communication between web applications and web servers.")
(define-public ghc-wai-logger
(package
(name "ghc-wai-logger")
(version "2.3.5")
(version "2.3.6")
(source
(origin
(method url-fetch)
@ -508,7 +516,7 @@ communication between web applications and web servers.")
".tar.gz"))
(sha256
(base32
"05gbipyw0672irynsc3wqvvgzqixhmq69ay2mxh2phb734r8bcmm"))))
"0hbm7if28p6qa36cgpyq6i569275si53z9gsl2g1z8x09z3xiyz2"))))
(build-system haskell-build-system)
(arguments `(#:tests? #f)) ; FIXME: Tests cannot find libraries exported
; by propagated-inputs.
@ -531,7 +539,7 @@ communication between web applications and web servers.")
(define-public ghc-wai-extra
(package
(name "ghc-wai-extra")
(version "3.0.28")
(version "3.1.6")
(source
(origin
(method url-fetch)
@ -541,7 +549,7 @@ communication between web applications and web servers.")
".tar.gz"))
(sha256
(base32
"0iky7k4kirngvk1p2nz19zgzffb5hppfaxdjan80v06ikc8w1wm7"))))
"03bbhmy8dc2ivhgbsrc39wk5kb9ci4p98pb2qcq2w92imy710cj6"))))
(build-system haskell-build-system)
(inputs
`(("ghc-ansi-terminal" ,ghc-ansi-terminal)
@ -620,7 +628,9 @@ Haskell's Web Application Interface (WAI).")
`(;; XXX: As of 0.0.4, one property test ("Identical output as Blaze")
;; fails on i686-linux.
#:tests? ,(not (string-prefix? "i686" (or (%current-target-system)
(%current-system))))))
(%current-system))))
#:cabal-revision
("3" "15hg352id2f4x0dnvv47bdiz6gv5hp5a2mki9yzmhc7ajpk31mdd")))
(native-inputs
`(("ghc-attoparsec" ,ghc-attoparsec)
("ghc-blaze-builder" ,ghc-blaze-builder)
@ -639,7 +649,7 @@ transfers.")
(define-public ghc-warp
(package
(name "ghc-warp")
(version "3.2.28")
(version "3.3.17")
(source
(origin
(method url-fetch)
@ -647,7 +657,7 @@ transfers.")
"warp-" version "/" "warp-" version
".tar.gz"))
(sha256
(base32 "0w2w3aiccpb2f8zssqiszcxzqdysihqi5xply23lwif5arz4saw7"))))
(base32 "0v54ca3wpa79gdyiikwhbv9h8b5vr3d60piq3ndb2v7s7fi1qpm0"))))
(build-system haskell-build-system)
(inputs
`(("ghc-async" ,ghc-async)
@ -666,6 +676,8 @@ transfers.")
("ghc-word8" ,ghc-word8)
("ghc-http-date" ,ghc-http-date)
("ghc-simple-sendfile" ,ghc-simple-sendfile)
("ghc-unliftio" ,ghc-unliftio)
("ghc-x509" ,ghc-x509)
("ghc-http2" ,ghc-http2)))
(native-inputs
`(("curl" ,curl)
@ -686,7 +698,7 @@ based WAI (Web Application Interface in Haskell).")
(define-public ghc-tls-session-manager
(package
(name "ghc-tls-session-manager")
(version "0.0.3")
(version "0.0.4")
(source
(origin
(method url-fetch)
@ -696,7 +708,7 @@ based WAI (Web Application Interface in Haskell).")
version ".tar.gz"))
(sha256
(base32
"0k57flqp2b4bipafiyfipnqmdqv04ky39yr4s4s9sx577zz2j2yi"))))
"134kb5nz668f4xrr5g98g7fc1bwb3ri6q433a1i6asjkniwpy85s"))))
(build-system haskell-build-system)
(inputs
`(("ghc-auto-update" ,ghc-auto-update)
@ -712,7 +724,7 @@ limitation, automatic pruning, energy saving and replay resistance.")
(define-public ghc-warp-tls
(package
(name "ghc-warp-tls")
(version "3.2.8")
(version "3.3.1")
(source
(origin
(method url-fetch)
@ -721,7 +733,7 @@ limitation, automatic pruning, energy saving and replay resistance.")
"warp-tls-" version ".tar.gz"))
(sha256
(base32
"1z5jzl40x1gp249fk8h51gkw6m3hzxchm2bp3kbpqdgmw8r5im8y"))))
"1k8f3r0l36mgwm69fikprv6pyjzj15702kq25dr9nc3sv5lcs162"))))
(build-system haskell-build-system)
(inputs
`(("ghc-cryptonite" ,ghc-cryptonite)
@ -741,17 +753,17 @@ a WAI handler, via the native Haskell TLS implementation.")
(define-public ghc-websockets
(package
(name "ghc-websockets")
(version "0.12.6.1")
(version "0.12.7.2")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://hackage/package/websockets/websockets-"
"https://hackage.haskell.org/package/websockets/websockets-"
version
".tar.gz"))
(sha256
(base32
"1vp3790w3hmr6v96314vdx74f7sg2c7hvnc93gafq0xhbxnr7nvx"))))
"1b92a41l2var1ccg350mh2bjmb2plb6d79yzvmlwkd41nifmmi44"))))
(build-system haskell-build-system)
(inputs
`(("ghc-attoparsec" ,ghc-attoparsec)
@ -761,6 +773,8 @@ a WAI handler, via the native Haskell TLS implementation.")
("ghc-network" ,ghc-network)
("ghc-random" ,ghc-random)
("ghc-sha" ,ghc-sha)
("ghc-clock" ,ghc-clock)
("ghc-async" ,ghc-async)
("ghc-streaming-commons" ,ghc-streaming-commons)
("ghc-entropy" ,ghc-entropy)))
(native-inputs
@ -919,7 +933,7 @@ documents.")
(define-public ghc-html-conduit
(package
(name "ghc-html-conduit")
(version "1.3.2.1")
(version "1.3.2.2")
(source
(origin
(method url-fetch)
@ -928,7 +942,7 @@ documents.")
"html-conduit-" version ".tar.gz"))
(sha256
(base32
"196c8zcnjp1pc5qvqxd8arx3xkw0a90rvg9mmiw2l4zwnx65709n"))))
"09bwrdam3y47kqllgg6w098ghqb8jb10dp4wxirsvx5ddpx9zpi6"))))
(build-system haskell-build-system)
(inputs
`(("ghc-resourcet" ,ghc-resourcet)
@ -965,7 +979,10 @@ entity decoding bugfixes applied.")
(base32
"0k1r1hddjgqighazcazxrx6xfhvy2gm8il8l82ainv3cai13yl30"))))
(build-system haskell-build-system)
(outputs '("out" "static" "doc"))
(arguments
`(#:tests? #f ; TODO: Depends on quickcheck<2.14
#:cabal-revision
("1" "0wvlfb3rd9cm3p894p5rl9kggrsr5da3n8x9ydrbagx91yvkxns9")))
(inputs
`(("ghc-blaze-builder" ,ghc-blaze-builder)
("ghc-blaze-markup" ,ghc-blaze-markup)))
@ -983,7 +1000,7 @@ entity decoding bugfixes applied.")
(define-public ghc-aeson
(package
(name "ghc-aeson")
(version "1.4.5.0")
(version "1.5.6.0")
(source
(origin
(method url-fetch)
@ -993,33 +1010,43 @@ entity decoding bugfixes applied.")
".tar.gz"))
(sha256
(base32
"1jhabz1lbbv6yqxqiybifi86cb5xlsadrn368n5dd0wzzc7ja4iz"))))
"1s5z4bgb5150h6a4cjf5vh8dmyrn6ilh29gh05999v6jwd5w6q83"))))
(build-system haskell-build-system)
(arguments `(#:tests? #f)) ; FIXME: testing libraries are missing.
(arguments
`(#:tests? #f ; FIXME: testing libraries are missing.
#:cabal-revision
("2" "1zxkarvmbgc2cpcc9sx1rlqm7nfh473052898ypiwk8azawp1hbj")))
(outputs '("out" "static" "doc"))
(inputs
`(("ghc-attoparsec" ,ghc-attoparsec)
("ghc-base-compat" ,ghc-base-compat)
("ghc-base-compat-batteries" ,ghc-base-compat-batteries)
("ghc-data-fix" ,ghc-data-fix)
("ghc-dlist" ,ghc-dlist)
("ghc-hashable" ,ghc-hashable)
("ghc-primitive" ,ghc-primitive)
("ghc-scientific" ,ghc-scientific)
("ghc-strict" ,ghc-strict)
("ghc-tagged" ,ghc-tagged)
("ghc-th-abstraction" ,ghc-th-abstraction)
("ghc-time-locale-compat" ,ghc-time-locale-compat)
("ghc-these" ,ghc-these)
("ghc-time-compat" ,ghc-time-compat)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-uuid-types" ,ghc-uuid-types)
("ghc-vector" ,ghc-vector)
("ghc-hunit" ,ghc-hunit)
("ghc-quickcheck" ,ghc-quickcheck)
("ghc-integer-logarithms" ,ghc-integer-logarithms)
("ghc-base-orphans" ,ghc-base-orphans)
("ghc-base16-bytestring" ,ghc-base16-bytestring)
("ghc-generic-deriving" ,ghc-generic-deriving)
("ghc-test-framework" ,ghc-test-framework)
("ghc-test-framework-hunit" ,ghc-test-framework-hunit)
("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2)
("ghc-quickcheck-instances" ,ghc-quickcheck-instances)
("ghc-hashable-time" ,ghc-hashable-time)))
("ghc-vector" ,ghc-vector)))
; (native-inputs
; `(("ghc-base16-bytestring" ,ghc-base16-bytestring)
; ("ghc-base-compat" ,ghc-base-compat)
; ("ghc-base-orphans" ,ghc-base-orphans)
; ("ghc-diff" ,ghc-diff)
; ("ghc-generic-deriving" ,ghc-generic-deriving)
; ("ghc-hashable-time" ,ghc-hashable-time)
; ("ghc-integer-logarithms" ,ghc-integer-logarithms)
; ("ghc-quickcheck" ,ghc-quickcheck)
; ("ghc-quickcheck-instances" ,ghc-quickcheck-instances)
; ("ghc-tasty" ,ghc-tasty)
; ("ghc-tasty-golden" ,ghc-tasty-golden)
; ("ghc-tasty-hunit" ,ghc-tasty-hunit)
; ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)))
(home-page "https://github.com/bos/aeson")
(synopsis "Fast JSON parsing and encoding")
(description "This package provides a JSON parsing and encoding library
@ -1063,14 +1090,14 @@ essentially the opposite of pretty-printing.")
(define-public ghc-aeson-qq
(package
(name "ghc-aeson-qq")
(version "0.8.2")
(version "0.8.3")
(source (origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"aeson-qq/aeson-qq-" version ".tar.gz"))
(sha256
(base32
"0ln13jqyfh5726hdrk1rad9a6cgrrj201plmwcfcpvq18v4m5ckd"))))
"10plwzz05qc8068av00jak8rcciw99cbxh3lkx522lmzi37jjccg"))))
(build-system haskell-build-system)
(inputs
`(("ghc-base-compat" ,ghc-base-compat)
@ -1126,7 +1153,7 @@ good error messages when parsing fails. See also
(define-public ghc-multipart
(package
(name "ghc-multipart")
(version "0.1.3")
(version "0.2.1")
(source
(origin
(method url-fetch)
@ -1136,7 +1163,7 @@ good error messages when parsing fails. See also
".tar.gz"))
(sha256
(base32
"1x4n4yyva22dhfr1pg5ki112qvvzb4hyd7bwpm189iq4gcp52q4z"))))
"0p6n4knxpjv70nbl6cmd6x7gkdjsjqp4ya7fz00bfrqp7jvhlivn"))))
(build-system haskell-build-system)
(inputs
`(("ghc-stringsearch" ,ghc-stringsearch)))
@ -1151,7 +1178,7 @@ good error messages when parsing fails. See also
(define-public ghc-uri-encode
(package
(name "ghc-uri-encode")
(version "1.5.0.5")
(version "1.5.0.7")
(source
(origin
(method url-fetch)
@ -1160,7 +1187,7 @@ good error messages when parsing fails. See also
version ".tar.gz"))
(sha256
(base32
"11miwb5vvnn17m92ykz1pzg9x6s8fbpz3mmsyqs2s4b3mn55haz8"))))
"0lj2h701af12539p957rw24bxr07mfqd5r4h52i42f43ax165767"))))
(build-system haskell-build-system)
(inputs
`(("ghc-utf8-string" ,ghc-utf8-string)
@ -1259,7 +1286,7 @@ avoid any issues with characters.")
(define-public ghc-yesod-core
(package
(name "ghc-yesod-core")
(version "1.6.17.2")
(version "1.6.21.0")
(source
(origin
(method url-fetch)
@ -1268,7 +1295,7 @@ avoid any issues with characters.")
"yesod-core-" version ".tar.gz"))
(sha256
(base32
"0rcfksbxnwcpg5qh9vjkddv39q95mx4nxzgix51bbwa128hhzcwf"))))
"0wmh7ip318p89lyy6k5mvxkkpq43knp41wlq9iaf3icz0ahqdmb7"))))
(build-system haskell-build-system)
(inputs `(("ghc-wai" ,ghc-wai)
("ghc-extra" ,ghc-extra)
@ -1328,7 +1355,7 @@ functions, widgets, etc.")
(define-public ghc-yesod-persistent
(package
(name "ghc-yesod-persistent")
(version "1.6.0.4")
(version "1.6.0.7")
(source
(origin
(method url-fetch)
@ -1337,7 +1364,7 @@ functions, widgets, etc.")
"yesod-persistent-" version ".tar.gz"))
(sha256
(base32
"1gsiw2zx6z7za7a164h0fxfggkrdqz6fn0qyb2zn9qr7r2jbg1c0"))))
"102xmp7n08sk1g5rv31jpln2v9kqf1zsqsnmi83mnhmgggcbj1k4"))))
(build-system haskell-build-system)
(arguments `(#:tests? #f)) ; FIXME: hspec-discover not available in PATH.
(inputs `(("ghc-yesod-core" ,ghc-yesod-core)
@ -1360,7 +1387,7 @@ from Yesod.")
(define-public ghc-yesod-form
(package
(name "ghc-yesod-form")
(version "1.6.7")
(version "1.7.0")
(source
(origin
(method url-fetch)
@ -1370,7 +1397,7 @@ from Yesod.")
".tar.gz"))
(sha256
(base32
"0mny71dyp6cp5akyp5wvmrhmip5rkqi8ibdn3lipvmajx9h58r5d"))))
"170gby381h5pg9njn908cyx2931yiv79x3rc5npg2rd74kif06vi"))))
(build-system haskell-build-system)
(inputs
`(("ghc-yesod-core" ,ghc-yesod-core)
@ -1402,7 +1429,7 @@ providing richtext field using Nic editor. ")
(define-public ghc-yesod
(package
(name "ghc-yesod")
(version "1.6.0")
(version "1.6.1.2")
(source
(origin
(method url-fetch)
@ -1411,31 +1438,26 @@ providing richtext field using Nic editor. ")
version ".tar.gz"))
(sha256
(base32
"0wx77nbpzdh40p1bm527kimfj48vs9d2avpvvz2w42zi3pz2y94a"))))
"13r0ispprj41kgn2rkc7zhy1rxfmgpjbmdlnys15h0ihhh3zhw2f"))))
(build-system haskell-build-system)
(inputs
`(("ghc-yesod-core" ,ghc-yesod-core)
("ghc-yesod-persistent" ,ghc-yesod-persistent)
("ghc-yesod-form" ,ghc-yesod-form)
("ghc-monad-control" ,ghc-monad-control)
("ghc-wai" ,ghc-wai)
("ghc-wai-extra" ,ghc-wai-extra)
("ghc-warp" ,ghc-warp)
("ghc-blaze-html" ,ghc-blaze-html)
("ghc-blaze-markup" ,ghc-blaze-markup)
("ghc-aeson" ,ghc-aeson)
("ghc-file-embed" ,ghc-file-embed)
("ghc-data-default-class" ,ghc-data-default-class)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-yaml" ,ghc-yaml)
("ghc-monad-logger" ,ghc-monad-logger)
("ghc-fast-logger" ,ghc-fast-logger)
("ghc-conduit" ,ghc-conduit)
("ghc-conduit-extra" ,ghc-conduit-extra)
("ghc-resourcet" ,ghc-resourcet)
("ghc-shakespeare" ,ghc-shakespeare)
("ghc-streaming-commons" ,ghc-streaming-commons)
("ghc-wai-logger" ,ghc-wai-logger)
("ghc-semigroups" ,ghc-semigroups)))
("ghc-wai-logger" ,ghc-wai-logger)))
(home-page "https://www.yesodweb.com")
(synopsis "Framework for creating type-safe, RESTful web applications")
(description "The Haskell package package groups together the various
@ -1446,7 +1468,7 @@ whereas most of the core code lives in @code{ghc-yesod-core}.")
(define-public ghc-hxt-charproperties
(package
(name "ghc-hxt-charproperties")
(version "9.4.0.0")
(version "9.5.0.0")
(source
(origin
(method url-fetch)
@ -1455,7 +1477,7 @@ whereas most of the core code lives in @code{ghc-yesod-core}.")
version ".tar.gz"))
(sha256
(base32
"1bk88hj2pqlvcnyfncqyb9j7w9vvdxcq3cgr0w2l09c0abas23pm"))))
"0jm98jddbsd60jc2bz8wa71rslagbaqf00ia7fvfsaiaa54nk0r8"))))
(build-system haskell-build-system)
(home-page "https://github.com/UweSchmidt/hxt")
(synopsis "Character properties and classes for XML and Unicode")
@ -1496,7 +1518,7 @@ ignored.")
(define-public ghc-hxt-regex-xmlschema
(package
(name "ghc-hxt-regex-xmlschema")
(version "9.2.0.3")
(version "9.2.0.7")
(source
(origin
(method url-fetch)
@ -1505,7 +1527,7 @@ ignored.")
version ".tar.gz"))
(sha256
(base32
"1c4jr0439f5yc05h7iz53fa47g6l2wrvqp6gvwf01mlqajk3nx7l"))))
"0ynrf65m7abq2fjnarlwq6i1r99pl89npibxx05rlplcgpybrdmr"))))
(build-system haskell-build-system)
(inputs
`(("ghc-hxt-charproperties" ,ghc-hxt-charproperties)
@ -1521,7 +1543,7 @@ derivations of regular expressions.")
(define-public ghc-hxt
(package
(name "ghc-hxt")
(version "9.3.1.18")
(version "9.3.1.22")
(source
(origin
(method url-fetch)
@ -1531,7 +1553,7 @@ derivations of regular expressions.")
".tar.gz"))
(sha256
(base32
"0836k65px3w9c5h1h2bmzq5a7mp6ajxwvfg3pfr2kbxwkgc0j63j"))))
"1n9snbdl46x23ka7bbsls1vsn0plpmfmbpbl0msjfm92fkk2yq7g"))))
(build-system haskell-build-system)
(outputs '("out" "static" "doc"))
(inputs
@ -1549,7 +1571,7 @@ introduces a more general approach for processing XML with Haskell.")
(define-public ghc-http-common
(package
(name "ghc-http-common")
(version "0.8.2.0")
(version "0.8.3.4")
(source
(origin
(method url-fetch)
@ -1557,13 +1579,14 @@ introduces a more general approach for processing XML with Haskell.")
"http-common/http-common-" version ".tar.gz"))
(sha256
(base32
"14s5a178sb2vm5k00rs21760mds5dz2gs10k9iyn22h01mxyf599"))))
"1xpbnfac0fqa5r670ggwm4kq3cmz9jpaw9bx40j9w9qiw6xi4i28"))))
(build-system haskell-build-system)
(inputs
`(("ghc-base64-bytestring" ,ghc-base64-bytestring)
("ghc-blaze-builder" ,ghc-blaze-builder)
("ghc-case-insensitive" ,ghc-case-insensitive)
("ghc-network" ,ghc-network)
("ghc-random" ,ghc-random)
("ghc-unordered-containers" ,ghc-unordered-containers)))
(home-page "https://github.com/afcowie/http-streams/")
(synopsis "Common types for HTTP clients and servers")
@ -1577,7 +1600,7 @@ pipes-http re-export this package's types and functions.")
(define-public ghc-http-streams
(package
(name "ghc-http-streams")
(version "0.8.6.1")
(version "0.8.9.4")
(source
(origin
(method url-fetch)
@ -1585,7 +1608,7 @@ pipes-http re-export this package's types and functions.")
"http-streams/http-streams-" version ".tar.gz"))
(sha256
(base32
"18vxd35n7s3z4gjvad94bknc8z1w9d7ccgphnhsxlz5cackizmxq"))))
"03xdcb0v735xdrkjlm1w56mskh3x08cbsjrcd7wn4li65ixc20xa"))))
(build-system haskell-build-system)
(inputs
`(("ghc-attoparsec" ,ghc-attoparsec)
@ -1613,7 +1636,7 @@ deal with the result.")
(define-public ghc-snap-core
(package
(name "ghc-snap-core")
(version "1.0.4.0")
(version "1.0.4.2")
(source
(origin
(method url-fetch)
@ -1621,8 +1644,12 @@ deal with the result.")
"snap-core/snap-core-" version ".tar.gz"))
(sha256
(base32
"0dklxgrbqhnb6bc4ic358g4fyj11ywmjrkxxhqcjmci2hhpn00mr"))))
"0zxdhx4wk70bkn71574lyz3zhq79yy98rv05r4564rd100xw3fqs"))))
(build-system haskell-build-system)
(arguments
`(#:tests? #f ; TODO: Fail to compile.
#:cabal-revision
("1" "065v61clskzikywv0gy9n4fjaszi2fnjklal83kqbzhzzgkf83ng")))
(inputs
`(("ghc-old-locale" ,ghc-old-locale)
("ghc-hunit" ,ghc-hunit)
@ -1660,7 +1687,7 @@ contains the core definitions and types for the Snap framework.")
(define-public ghc-snap-server
(package
(name "ghc-snap-server")
(version "1.1.1.1")
(version "1.1.2.0")
(source
(origin
(method url-fetch)
@ -1668,7 +1695,7 @@ contains the core definitions and types for the Snap framework.")
"snap-server/snap-server-" version ".tar.gz"))
(sha256
(base32
"0lw475wp0lnrbgc3jcfif3qjjc3pmrh2k74d8cgpnc1304g6a2s5"))))
"0w4yv9a5ilpma0335ariwap2iscmdbaaif88lq3cm7px910nyc4j"))))
(build-system haskell-build-system)
(inputs
`(("ghc-attoparsec" ,ghc-attoparsec)
@ -1697,9 +1724,6 @@ contains the core definitions and types for the Snap framework.")
("ghc-test-framework" ,ghc-test-framework)
("ghc-test-framework-hunit" ,ghc-test-framework-hunit)
("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2)))
(arguments
`(#:cabal-revision
("1" "094b7ll47lxd4lvr6kd59jyw0vz686gw5cx16w758d6fli0cy3x3")))
(home-page "http://snapframework.com/")
(synopsis "Web server for the Snap Framework")
(description "Snap is a simple and fast web development framework
@ -1767,7 +1791,7 @@ requirements of downstream users (e.g. Debian).")
(define-public ghc-happstack-server
(package
(name "ghc-happstack-server")
(version "7.5.4")
(version "7.7.1.1")
(source
(origin
(method url-fetch)
@ -1776,7 +1800,7 @@ requirements of downstream users (e.g. Debian).")
version ".tar.gz"))
(sha256
(base32
"0i7csvmwv7n68gkwqzi985p2mjdgzipjnlj873sdiknhx9pfmq70"))))
"0nc5rnvrzl9m3pinmdq234m80qkf4jszbdqnd567f7lh09yiqw9n"))))
(build-system haskell-build-system)
(inputs
`(("ghc-network" ,ghc-network)
@ -1835,7 +1859,7 @@ cookies, serving files, and more.")
(define-public ghc-scalpel-core
(package
(name "ghc-scalpel-core")
(version "0.6.0")
(version "0.6.2")
(source
(origin
(method url-fetch)
@ -1844,7 +1868,7 @@ cookies, serving files, and more.")
"scalpel-core-" version ".tar.gz"))
(sha256
(base32
"1qf0gnidyh8zk0acj99vn6hsj37m410lrm50sqpiv1i36rpmmsqh"))))
"07mjff8aqwabx8yhq8bd7jpnarkkrjqss8h8s2wkfmfj808fllmf"))))
(build-system haskell-build-system)
(inputs
`(("ghc-data-default" ,ghc-data-default)
@ -1867,7 +1891,7 @@ non-Haskell dependencies.")
(define-public ghc-scalpel
(package
(name "ghc-scalpel")
(version "0.6.0")
(version "0.6.2")
(source
(origin
(method url-fetch)
@ -1876,7 +1900,7 @@ non-Haskell dependencies.")
"scalpel-" version ".tar.gz"))
(sha256
(base32
"0jbrfcgljl8kbcwi2zqx1jp3c3dpxrkc94za44x56kcz68n89hlz"))))
"04hhvk0yjxha3yg6n9fxivrz97hpjjiiblnj0bvs5myax1ggkjch"))))
(build-system haskell-build-system)
(inputs
`(("ghc-scalpel-core" ,ghc-scalpel-core)
@ -1897,17 +1921,17 @@ declarative and monadic interface.")
(define-public ghc-sourcemap
(package
(name "ghc-sourcemap")
(version "0.1.6")
(version "0.1.6.1")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://hackage/package/sourcemap/sourcemap-"
"https://hackage.haskell.org/package/sourcemap/sourcemap-"
version
".tar.gz"))
(sha256
(base32
"0ynfm44ym8y592wnzdwa0d05dbkffyyg5sm26y5ylzpynk64r85r"))))
"0kz8xpcd5syg5s4qa2qq8ylaxjhabj127w42may46vv6i0q1bf8a"))))
(build-system haskell-build-system)
(inputs
`(("ghc-aeson" ,ghc-aeson)
@ -1931,17 +1955,17 @@ proposed by Google and Mozilla here
(define-public ghc-language-javascript
(package
(name "ghc-language-javascript")
(version "0.7.0.0")
(version "0.7.1.0")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://hackage/package/language-javascript/language-javascript-"
"https://hackage.haskell.org/package/language-javascript/language-javascript-"
version
".tar.gz"))
(sha256
(base32
"15bpqpkjf2y3fk8wff9zlnkpsjc63bnbvhlkxrs9alj0bikq17nk"))))
"0s6igb54cxm2jywgc3sq53f52gcsc39wd3g78yisfzvl9jm3d86i"))))
(build-system haskell-build-system)
(inputs
`(("ghc-blaze-builder" ,ghc-blaze-builder)
@ -2029,7 +2053,7 @@ Authoring and Versioning (WebDAV) extensions to HTTP as well an executable,
(define-public ghc-yesod-test
(package
(name "ghc-yesod-test")
(version "1.6.9")
(version "1.6.12")
(source
(origin
(method url-fetch)
@ -2037,7 +2061,7 @@ Authoring and Versioning (WebDAV) extensions to HTTP as well an executable,
"yesod-test/yesod-test-" version ".tar.gz"))
(sha256
(base32
"0v25lqq7hgd5lggnyfd9kamkzd4126rd7vlhc131n253n4by4yak"))))
"1xgy7dzhqjgllqcpyyxs0spdg6vlz2c1sjvni7w7qnsf0ckyw2l8"))))
(build-system haskell-build-system)
(inputs
`(("ghc-hunit" ,ghc-hunit)
@ -2077,7 +2101,7 @@ HTML responses using CSS selectors.")
(define-public ghc-wai-app-static
(package
(name "ghc-wai-app-static")
(version "3.1.7.1")
(version "3.1.7.2")
(source
(origin
(method url-fetch)
@ -2086,7 +2110,7 @@ HTML responses using CSS selectors.")
version ".tar.gz"))
(sha256
(base32
"10k6jb450p89r6dgpnwh428gg0wfw2qbx9n126jkvbchcjr1f4v8"))))
"138gd5482psq0wbm8s1az672lksi7vbavq6ayiyjkliivf6xpry8"))))
(build-system haskell-build-system)
(inputs
`(("ghc-wai" ,ghc-wai)
@ -2112,7 +2136,7 @@ HTML responses using CSS selectors.")
("ghc-mockery" ,ghc-mockery)))
(arguments
`(#:cabal-revision
("1" "0bkmml30rzifvb7nxddj3pxczk0kniahra19mjn0qrkzy1n5752p")))
("1" "1q7zwjasysgbp9rdp75535igd7s6mhi2bnl4pzsn6vbyfw3qnsxd")))
(home-page "https://www.yesodweb.com/book/web-application-interface")
(synopsis "WAI application for static serving")
(description "This package provides a Web Application
@ -2155,7 +2179,7 @@ syntactic elements, without changing the semantics.")
(define-public ghc-yesod-static
(package
(name "ghc-yesod-static")
(version "1.6.0.1")
(version "1.6.1.0")
(source
(origin
(method url-fetch)
@ -2163,7 +2187,7 @@ syntactic elements, without changing the semantics.")
"yesod-static/yesod-static-" version ".tar.gz"))
(sha256
(base32
"1jd0ryfr2vyrwasyvbqmc6j4ngv1lgz78w427f169l7gyl1firxb"))))
"18f5hm9ncvkzl8bkn39cg841z0k5iqs5w45afsyk9y6k98pjd54p"))))
(build-system haskell-build-system)
(inputs
`(("ghc-async" ,ghc-async)
@ -2270,3 +2294,25 @@ server no longer receives pings, it shuts down.")
Resource Sharing (CORS) for the Web Application Framework (WAI) that
aims to be compliant with @url{https://www.w3.org/TR/cors}.")
(license license:expat)))
(define-public ghc-network-run
(package
(name "ghc-network-run")
(version "0.2.4")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/network-run/network-run-"
version
".tar.gz"))
(sha256
(base32 "0w3dmwk03j4n01xkiq8m4sqa27bskh239mpw7m4ihjmkxqcwc5gl"))))
(build-system haskell-build-system)
(inputs `(("ghc-network" ,ghc-network)))
(home-page "https://hackage.haskell.org/package/network-run")
(synopsis "Simple network runner library")
(description
"This package provides a simple network runner library in Haskell.")
(license license:bsd-3)))

3673
gnu/packages/haskell-xyz.scm
View File

File diff suppressed because it is too large Load Diff

7
gnu/packages/idris.scm
View File

@ -97,12 +97,11 @@
(lambda _
(setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/dist/build"))
#t))
(add-after 'unpack 'update-constraints
(add-before 'configure 'update-constraints
(lambda _
(substitute* "idris.cabal"
(("ansi-terminal < 0\\.9") "ansi-terminal < 0.10")
(("cheapskate >= 0\\.1\\.1\\.2 && < 0\\.2") "cheapskate >= 0.1.1.1 && < 0.2"))
#t))
(("(aeson|ansi-terminal|haskeline|megaparsec|optparse-applicative)\\s+[^,]+" all dep)
dep))))
(add-before 'configure 'set-cc-command
(lambda _
(setenv "CC" "gcc")

20
gnu/packages/patches/ghc-diff-swap-cover-args.patch
View File

@ -1,20 +0,0 @@
The QuickCheck library swapped the order of the arguments of the 'cover'
function in version 2.12. Version 0.3.4 of the Diff library still uses
the old argument order. Swapping the argument order makes Diff work
with newer versions of QuickCheck.
See <https://github.com/commercialhaskell/stackage/issues/4289> for the
upstream bug report.
diff -ruN a/test/Test.hs b/test/Test.hs
--- a/test/Test.hs 2016-04-23 01:21:45.000000000 -0400
+++ b/test/Test.hs 2019-11-01 19:13:04.590770903 -0400
@@ -134,7 +134,7 @@
prop_ppDiffR (DiffInput le ri) =
let haskDiff=ppDiff $ getGroupedDiff le ri
utilDiff= unsafePerformIO (runDiff (unlines le) (unlines ri))
- in cover (haskDiff == utilDiff) 90 "exact match" $
+ in cover 90 (haskDiff == utilDiff) "exact match" $
classify (haskDiff == utilDiff) "exact match"
(div ((length haskDiff)*100) (length utilDiff) < 110) -- less than 10% bigger
where

54
gnu/packages/patches/ghc-haddock-api-fix-haddock.patch
View File

@ -1,54 +0,0 @@
This patch is taken from upstream. It fixes documentation generation.
The patch has been lightly adapted to apply to the release tarball, but
the commit message was left untouched, so it refers to some changes not
included in the patch.
From 0d9a81e20238a6b72f9f5c005f1f7e9cf05f6fb9 Mon Sep 17 00:00:00 2001
From: Alec Theriault <alec.theriault@gmail.com>
Date: Sat, 27 Oct 2018 10:05:04 -0700
Subject: [PATCH] Fix documentation in `haddock-api` (#957)
* Fix misplaced Haddocks in Haddock itself
Haddock should be able to generate documentation for 'haddock-api'
again.
* Make CI check that documentation can be built.
* Add back a doc that is OK
---
.travis.yml | 3 +++
haddock-api/src/Haddock/Backends/LaTeX.hs | 10 +++++-----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/Haddock/Backends/LaTeX.hs b/src/Haddock/Backends/LaTeX.hs
index 4e0e6eba..613c6deb 100644
--- a/src/Haddock/Backends/LaTeX.hs
+++ b/src/Haddock/Backends/LaTeX.hs
@@ -243,8 +243,8 @@ ppDocGroup lev doc = sec lev <> braces doc
-- | Given a declaration, extract out the names being declared
declNames :: LHsDecl DocNameI
- -> ( LaTeX -- ^ to print before each name in an export list
- , [DocName] -- ^ names being declared
+ -> ( LaTeX -- to print before each name in an export list
+ , [DocName] -- names being declared
)
declNames (L _ decl) = case decl of
TyClD _ d -> (empty, [tcdName d])
@@ -444,9 +444,9 @@ ppLPatSig doc docnames ty unicode
-- arguments as needed.
ppTypeOrFunSig :: HsType DocNameI
-> DocForDecl DocName -- ^ documentation
- -> ( LaTeX -- ^ first-line (no-argument docs only)
- , LaTeX -- ^ first-line (argument docs only)
- , LaTeX -- ^ type prefix (argument docs only)
+ -> ( LaTeX -- first-line (no-argument docs only)
+ , LaTeX -- first-line (argument docs only)
+ , LaTeX -- type prefix (argument docs only)
)
-> Bool -- ^ unicode
-> LaTeX
--
2.23.0

193
gnu/packages/patches/ghc-hpack-fix-tests.patch
View File

@ -1,193 +0,0 @@
This patch is taken and adapted from upstream. It landed shortly after
the release of 0.31.2, and fixes eleven tests. The patch has been
lightly adapted to apply to the release tarball, but the commit message
was left untouched, so it refers to some changes not included in the
patch.
From a8d9362d4b686074f698c04c20beea88587511a1 Mon Sep 17 00:00:00 2001
From: quasicomputational <quasicomputational@gmail.com>
Date: Sat, 1 Jun 2019 15:11:31 +0100
Subject: [PATCH] Make CI green (#345)
* AppVeyor workaround for TMP issue
https://github.com/commercialhaskell/stack/issues/3944
* Bump resolver to nightly-2018-12-12.
This has the primary benefit of moving to GHC 8.6.3 and should fix
AppVeyor.
* Add clock 0.8 as an extra-dep.
* Adapt expected output to aeson 1.4.3.0.
---
appveyor.yml | 3 +++
hpack.cabal | 10 +++++-----
package.yaml | 2 +-
stack.yaml | 5 +++--
test/Data/Aeson/Config/FromValueSpec.hs | 2 +-
test/Data/Aeson/Config/TypesSpec.hs | 2 +-
test/EndToEndSpec.hs | 8 ++++----
test/Hpack/ConfigSpec.hs | 2 +-
test/Hpack/Syntax/DefaultsSpec.hs | 2 +-
test/Hpack/Syntax/DependenciesSpec.hs | 4 ++--
10 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/hpack.cabal b/hpack.cabal
index fedb9a8..4db3014 100644
--- a/hpack.cabal
+++ b/hpack.cabal
@@ -1,10 +1,10 @@
cabal-version: 1.12
--- This file has been generated from package.yaml by hpack version 0.31.0.
+-- This file has been generated from package.yaml by hpack version 0.31.2.
--
-- see: https://github.com/sol/hpack
--
--- hash: 3d060180293c32b8d0c25b710d0f419e96a6cc6ec3f95ac5e70bb77f44cbafc3
+-- hash: bd5dd178c7e9f7f7a3456d79b592ea336c41ef43c9892354c001f06659e8b901
name: hpack
version: 0.31.2
@@ -31,7 +31,7 @@ library
build-depends:
Cabal >=2.2
, Glob >=0.9.0
- , aeson >=1.2.1.0
+ , aeson >=1.4.3.0
, base >=4.9 && <5
, bifunctors
, bytestring
@@ -87,7 +87,7 @@ executable hpack
build-depends:
Cabal >=2.2
, Glob >=0.9.0
- , aeson >=1.2.1.0
+ , aeson >=1.4.3.0
, base >=4.9 && <5
, bifunctors
, bytestring
@@ -125,7 +125,7 @@ test-suite spec
, Glob >=0.9.0
, HUnit >=1.6.0.0
, QuickCheck
- , aeson >=1.2.1.0
+ , aeson >=1.4.3.0
, base >=4.9 && <5
, bifunctors
, bytestring
diff --git a/test/Data/Aeson/Config/FromValueSpec.hs b/test/Data/Aeson/Config/FromValueSpec.hs
index 33de8b7..06b3eb9 100644
--- a/test/Data/Aeson/Config/FromValueSpec.hs
+++ b/test/Data/Aeson/Config/FromValueSpec.hs
@@ -85,7 +85,7 @@ spec = do
[yaml|
name: "Joe"
age: "23"
- |] `shouldDecodeTo` left "Error while parsing $.age - expected Int, encountered String"
+ |] `shouldDecodeTo` left "Error while parsing $.age - parsing Int failed, expected Number, but encountered String"
context "with (,)" $ do
it "captures unrecognized fields" $ do
diff --git a/test/Data/Aeson/Config/TypesSpec.hs b/test/Data/Aeson/Config/TypesSpec.hs
index c954534..472aa42 100644
--- a/test/Data/Aeson/Config/TypesSpec.hs
+++ b/test/Data/Aeson/Config/TypesSpec.hs
@@ -13,7 +13,7 @@ spec = do
context "List" $ do
let
parseError :: String -> Result (List Int)
- parseError prefix = Left (prefix ++ " - expected Int, encountered String")
+ parseError prefix = Left (prefix ++ " - parsing Int failed, expected Number, but encountered String")
context "when parsing single values" $ do
it "returns the value in a singleton list" $ do
diff --git a/test/EndToEndSpec.hs b/test/EndToEndSpec.hs
index 283c72c..46389ea 100644
--- a/test/EndToEndSpec.hs
+++ b/test/EndToEndSpec.hs
@@ -285,7 +285,7 @@ spec = around_ (inTempDirectoryNamed "foo") $ do
path: defaults.yaml
ref: "2017"
library: {}
- |] `shouldFailWith` (file ++ ": Error while parsing $ - expected Object, encountered Array")
+ |] `shouldFailWith` (file ++ ": Error while parsing $ - expected Object, but encountered Array")
it "warns on unknown fields" $ do
let file = joinPath ["defaults", "sol", "hpack-template", "2017", "defaults.yaml"]
@@ -340,7 +340,7 @@ spec = around_ (inTempDirectoryNamed "foo") $ do
it "rejects other values" $ do
[i|
version: {}
- |] `shouldFailWith` "package.yaml: Error while parsing $.version - expected Number or String, encountered Object"
+ |] `shouldFailWith` "package.yaml: Error while parsing $.version - expected Number or String, but encountered Object"
describe "license" $ do
it "accepts cabal-style licenses" $ do
@@ -1363,14 +1363,14 @@ spec = around_ (inTempDirectoryNamed "foo") $ do
then:
dependencies: Win32
else: null
- |] `shouldFailWith` "package.yaml: Error while parsing $.when.else - expected Object, encountered Null"
+ |] `shouldFailWith` "package.yaml: Error while parsing $.when.else - expected Object, but encountered Null"
it "rejects invalid conditionals" $ do
[i|
dependencies:
- foo
- 23
- |] `shouldFailWith` "package.yaml: Error while parsing $.dependencies[1] - expected Object or String, encountered Number"
+ |] `shouldFailWith` "package.yaml: Error while parsing $.dependencies[1] - expected Object or String, but encountered Number"
it "warns on unknown fields" $ do
[i|
diff --git a/test/Hpack/ConfigSpec.hs b/test/Hpack/ConfigSpec.hs
index 9f4b279..69cbea1 100644
--- a/test/Hpack/ConfigSpec.hs
+++ b/test/Hpack/ConfigSpec.hs
@@ -675,7 +675,7 @@ spec = do
it "rejects other values" $ do
[yaml|
23
- |] `shouldDecodeTo` (Left "Error while parsing $ - expected Boolean or String, encountered Number" :: Result Cond)
+ |] `shouldDecodeTo` (Left "Error while parsing $ - expected Boolean or String, but encountered Number" :: Result Cond)
describe "formatOrList" $ do
it "formats a singleton list" $ do
diff --git a/test/Hpack/Syntax/DefaultsSpec.hs b/test/Hpack/Syntax/DefaultsSpec.hs
index 5875413..5438b7a 100644
--- a/test/Hpack/Syntax/DefaultsSpec.hs
+++ b/test/Hpack/Syntax/DefaultsSpec.hs
@@ -151,4 +151,4 @@ spec = do
it "fails" $ do
[yaml|
10
- |] `shouldDecodeTo` left "Error while parsing $ - expected Object or String, encountered Number"
+ |] `shouldDecodeTo` left "Error while parsing $ - expected Object or String, but encountered Number"
diff --git a/test/Hpack/Syntax/DependenciesSpec.hs b/test/Hpack/Syntax/DependenciesSpec.hs
index 1a83732..d95044f 100644
--- a/test/Hpack/Syntax/DependenciesSpec.hs
+++ b/test/Hpack/Syntax/DependenciesSpec.hs
@@ -125,7 +125,7 @@ spec = do
it "rejects invalid values" $ do
[yaml|
hpack: []
- |] `shouldDecodeTo` left "Error while parsing $.hpack - expected Null, Object, Number, or String, encountered Array"
+ |] `shouldDecodeTo` left "Error while parsing $.hpack - expected Null, Object, Number, or String, but encountered Array"
context "when the constraint is a Number" $ do
it "accepts 1" $ do
@@ -213,7 +213,7 @@ spec = do
[yaml|
foo:
version: {}
- |] `shouldDecodeTo` left "Error while parsing $.foo.version - expected Null, Number, or String, encountered Object"
+ |] `shouldDecodeTo` left "Error while parsing $.foo.version - expected Null, Number, or String, but encountered Object"
it "accepts a string" $ do
[yaml|
--
2.23.0

27
gnu/packages/patches/ghc-language-haskell-extract-ghc-8.10.patch 100644
View File

@ -0,0 +1,27 @@
Compatibility with GHC 8.10 and template-haskell 2.16.
Taken from
https://raw.githubusercontent.com/archlinux/svntogit-community/packages/haskell-language-haskell-extract/trunk/ghc-8.10.patch
diff --git a/src/Language/Haskell/Extract.hs b/src/Language/Haskell/Extract.hs
index 3e8958b..43dfe04 100644
--- a/src/Language/Haskell/Extract.hs
+++ b/src/Language/Haskell/Extract.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
module Language.Haskell.Extract (
functionExtractor,
functionExtractorMap,
@@ -25,7 +26,11 @@ extractAllFunctions pattern =
functionExtractor :: String -> ExpQ
functionExtractor pattern =
do functions <- extractAllFunctions pattern
- let makePair n = TupE [ LitE $ StringL n , VarE $ mkName n]
+ let makePair n = TupE
+#if MIN_VERSION_template_haskell(2,16,0)
+ $ map Just
+#endif
+ [ LitE $ StringL n , VarE $ mkName n]
return $ ListE $ map makePair functions

27
gnu/packages/patches/ghc-microlens-aeson-fix-tests.patch
View File

@ -1,27 +0,0 @@
This patch fixes the test suite to allow any order when listing the
members of a JSON object. Aeson (being true to the JSON specification)
does not specify an order for objects. In practice, the order depends
on your processor architecture.
See <https://github.com/bos/aeson/issues/568> for a discussion resulting
in a similar patch fixing the Aeson tests.
See <https://github.com/fosskers/microlens-aeson/issues/1> for the
upstream bug report.
diff -ruN a/test/Test.hs b/test/Test.hs
--- a/test/Test.hs 2018-12-31 15:10:50.000000000 -0500
+++ b/test/Test.hs 2019-11-08 01:34:07.419706831 -0500
@@ -48,8 +48,10 @@
, testCase "" $ ("{\"a\": {}, \"b\": null}" ^? key (T.pack "b") . _Object) @?= Nothing
, testCase "" $ ("{\"a\": 100, \"b\": 200}" ^? key (T.pack "a")) @?= Just (Number 100.0)
, testCase "" $ ("[1,2,3]" ^? key (T.pack "a")) @?= Nothing
- , testCase "" $ ("{\"a\": 4, \"b\": 7}" ^.. members) @?= [Number 4.0,Number 7.0]
- , testCase "" $ ("{\"a\": 4, \"b\": 7}" & members . _Number %~ (* 10)) @?= "{\"a\":40,\"b\":70}"
+ , testCase "" $ assertBool "" (let x = ("{\"a\": 4, \"b\": 7}" ^.. members)
+ in x == [Number 4.0,Number 7.0] || x == [Number 7.0,Number 4.0])
+ , testCase "" $ assertBool "" (let x = ("{\"a\": 4, \"b\": 7}" & members . _Number %~ (* 10))
+ in x == "{\"a\":40,\"b\":70}" || x == "{\"b\":70,\"a\":40}")
, testCase "" $ ("[1,2,3]" ^? nth 1) @?= Just (Number 2.0)
, testCase "" $ ("{\"a\": 100, \"b\": 200}" ^? nth 1) @?= Nothing
, testCase "" $ ("[1,2,3]" & nth 1 .~ Number 20) @?= "[1,20,3]"

92
gnu/packages/patches/ghc-pandoc-fix-html-tests.patch
View File

@ -1,92 +0,0 @@
This patch is taken from upstream. It fixes two HTML tests that are broken
due to using a Skylighting version greater than or equal to 0.8.2.
From 968d2046a3cb6db661673be580660ac402753c34 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sun, 14 Jul 2019 10:48:14 -0700
Subject: [PATCH] Update test for new skylighting.
---
test/lhs-test.html | 13 ++++++-------
test/lhs-test.html+lhs | 13 ++++++-------
2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/test/lhs-test.html b/test/lhs-test.html
index 6685555f4..446dd3d95 100644
--- a/test/lhs-test.html
+++ b/test/lhs-test.html
@@ -12,19 +12,18 @@
div.column{display: inline-block; vertical-align: top; width: 50%;}
</style>
<style>
-code.sourceCode > span { display: inline-block; line-height: 1.25; }
+pre > code.sourceCode { white-space: pre; position: relative; }
+pre > code.sourceCode > span { display: inline-block; line-height: 1.25; }
+pre > code.sourceCode > span:empty { height: 1.2em; }
code.sourceCode > span { color: inherit; text-decoration: inherit; }
-code.sourceCode > span:empty { height: 1.2em; }
-.sourceCode { overflow: visible; }
-code.sourceCode { white-space: pre; position: relative; }
div.sourceCode { margin: 1em 0; }
pre.sourceCode { margin: 0; }
@media screen {
div.sourceCode { overflow: auto; }
}
@media print {
-code.sourceCode { white-space: pre-wrap; }
-code.sourceCode > span { text-indent: -5em; padding-left: 5em; }
+pre > code.sourceCode { white-space: pre-wrap; }
+pre > code.sourceCode > span { text-indent: -5em; padding-left: 5em; }
}
pre.numberSource code
{ counter-reset: source-line 0; }
@@ -44,7 +43,7 @@ pre.numberSource { margin-left: 3em; border-left: 1px solid #aaaaaa; padding-le
div.sourceCode
{ }
@media screen {
-code.sourceCode > span > a:first-child::before { text-decoration: underline; }
+pre > code.sourceCode > span > a:first-child::before { text-decoration: underline; }
}
code span.al { color: #ff0000; font-weight: bold; } /* Alert */
code span.an { color: #60a0b0; font-weight: bold; font-style: italic; } /* Annotation */
diff --git a/test/lhs-test.html+lhs b/test/lhs-test.html+lhs
index e57dfc105..a5cdb0245 100644
--- a/test/lhs-test.html+lhs
+++ b/test/lhs-test.html+lhs
@@ -12,19 +12,18 @@
div.column{display: inline-block; vertical-align: top; width: 50%;}
</style>
<style>
-code.sourceCode > span { display: inline-block; line-height: 1.25; }
+pre > code.sourceCode { white-space: pre; position: relative; }
+pre > code.sourceCode > span { display: inline-block; line-height: 1.25; }
+pre > code.sourceCode > span:empty { height: 1.2em; }
code.sourceCode > span { color: inherit; text-decoration: inherit; }
-code.sourceCode > span:empty { height: 1.2em; }
-.sourceCode { overflow: visible; }
-code.sourceCode { white-space: pre; position: relative; }
div.sourceCode { margin: 1em 0; }
pre.sourceCode { margin: 0; }
@media screen {
div.sourceCode { overflow: auto; }
}
@media print {
-code.sourceCode { white-space: pre-wrap; }
-code.sourceCode > span { text-indent: -5em; padding-left: 5em; }
+pre > code.sourceCode { white-space: pre-wrap; }
+pre > code.sourceCode > span { text-indent: -5em; padding-left: 5em; }
}
pre.numberSource code
{ counter-reset: source-line 0; }
@@ -44,7 +43,7 @@ pre.numberSource { margin-left: 3em; border-left: 1px solid #aaaaaa; padding-le
div.sourceCode
{ }
@media screen {
-code.sourceCode > span > a:first-child::before { text-decoration: underline; }
+pre > code.sourceCode > span > a:first-child::before { text-decoration: underline; }
}
code span.al { color: #ff0000; font-weight: bold; } /* Alert */
code span.an { color: #60a0b0; font-weight: bold; font-style: italic; } /* Annotation */
--
2.23.0

31
gnu/packages/patches/ghc-pandoc-fix-latex-test.patch
View File

@ -1,31 +0,0 @@
This patch is taken from upstream. It fixes a LaTeX test that is broken due
to using a Skylighting version greater than or equal to 0.8.1.1.
From 2cd1c7b30f200d18f1f1bdef1671369e1ad303ed Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Thu, 13 Jun 2019 19:33:52 -0700
Subject: [PATCH] Update test for skylighting 0.8.1.1.
---
test/lhs-test.latex | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/lhs-test.latex b/test/lhs-test.latex
index 0442db5ca..a456995a3 100644
--- a/test/lhs-test.latex
+++ b/test/lhs-test.latex
@@ -94,9 +94,9 @@ return a single value:
\begin{Shaded}
\begin{Highlighting}[]
-\OtherTok{unsplit ::}\NormalTok{ (}\DataTypeTok{Arrow}\NormalTok{ a) }\OtherTok{=>}\NormalTok{ (b }\OtherTok{->}\NormalTok{ c }\OtherTok{->}\NormalTok{ d) }\OtherTok{->}\NormalTok{ a (b, c) d}
+\OtherTok{unsplit ::}\NormalTok{ (}\DataTypeTok{Arrow}\NormalTok{ a) }\OtherTok{=>}\NormalTok{ (b }\OtherTok{{-}>}\NormalTok{ c }\OtherTok{{-}>}\NormalTok{ d) }\OtherTok{{-}>}\NormalTok{ a (b, c) d}
\NormalTok{unsplit }\OtherTok{=}\NormalTok{ arr }\OperatorTok{.} \FunctionTok{uncurry}
- \CommentTok{-- arr (\textbackslash{}op (x,y) -> x `op` y)}
+ \CommentTok{{-}{-} arr (\textbackslash{}op (x,y) {-}> x \textasciigrave{}op\textasciigrave{} y)}
\end{Highlighting}
\end{Shaded}
--
2.23.0

40
gnu/packages/patches/purescript-relax-dependencies.patch
View File

@ -1,40 +0,0 @@
Allow the purescript dependencies to better match the available packages in
Guix.
--- purescript-0.13.8/purescript.cabal
+++ purescript-0.13.8/purescript.cabal.orig
@@ -1091 +1091 @@ library
- Glob ==0.9.*,
+ Glob ==0.10.*,
@@ -1095 +1095 @@ library
- ansi-terminal >=0.7.1 && <0.9,
+ ansi-terminal ==0.9.*,
@@ -1105 +1105 @@ library
- clock <0.8,
+ clock ==0.8.*,
@@ -1173 +1173 @@ executable purs
- Glob ==0.9.*,
+ Glob ==0.10.*,
@@ -1177 +1177 @@ executable purs
- ansi-terminal >=0.7.1 && <0.9,
+ ansi-terminal ==0.9.*,
@@ -1188 +1188 @@ executable purs
- clock <0.8,
+ clock ==0.8.*,
@@ -1209 +1209 @@ executable purs
- network >=3.0.1.1 && <3.1,
+ network >=2.8 && <3.1,
@@ -1288 +1288 @@ test-suite tests
- Glob ==0.9.*,
+ Glob ==0.10.*,
@@ -1293 +1293 @@ test-suite tests
- ansi-terminal >=0.7.1 && <0.9,
+ ansi-terminal ==0.9.*,
@@ -1303 +1303 @@ test-suite tests
- clock <0.8,
+ clock ==0.8.*,
@@ -1315,2 +1315,2 @@ test-suite tests
- hspec <2.7,
- hspec-discover <2.7,
+ hspec ==2.7.*,
+ hspec-discover ==2.7.*,

97
gnu/packages/purescript.scm
View File

@ -30,36 +30,20 @@
#:use-module (guix build-system haskell)
#:use-module ((guix licenses) #:prefix license:))
(define ghc-happy-1.19.9
(package
(inherit ghc-happy)
(version "1.19.9")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/happy/happy-"
version
".tar.gz"))
(sha256
(base32
"138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y"))))))
(define-public purescript
(package
(name "purescript")
(version "0.13.8")
(version "0.14.4")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://hackage/package/purescript/purescript-"
"https://hackage.haskell.org/package/purescript/purescript-"
version
".tar.gz"))
(sha256
(base32
"0sh9z3ir3jiwmi5h95v9p7j746xxidg1hrxha89c0zl6vr4sq7vh"))
(patches (search-patches "purescript-relax-dependencies.patch"))))
"0qda90yycv2yyjdpfqvmsnxbyxpx55b53cfp9rgnbhbrskr0w2vk"))))
(build-system haskell-build-system)
(inputs
`(("ghc-glob" ,ghc-glob)
@ -92,6 +76,7 @@
("ghc-parallel" ,ghc-parallel)
("ghc-pattern-arrows" ,ghc-pattern-arrows)
("ghc-protolude" ,ghc-protolude)
("ghc-purescript-cst" ,ghc-purescript-cst)
("ghc-regex-tdfa" ,ghc-regex-tdfa)
("ghc-safe" ,ghc-safe)
("ghc-scientific" ,ghc-scientific)
@ -111,13 +96,13 @@
("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint)
("ghc-http-types" ,ghc-http-types)
("ghc-network" ,ghc-network)
("ghc-optparse-applicative" ,ghc-optparse-applicative)
("ghc-optparse-applicative" ,ghc-optparse-applicative-0.15.1.0) ; XXX: needs specific version
("ghc-wai" ,ghc-wai)
("ghc-wai-websockets" ,ghc-wai-websockets)
("ghc-warp" ,ghc-warp)
("ghc-websockets" ,ghc-websockets)))
(native-inputs
`(("ghc-happy" ,ghc-happy-1.19.9) ; build fails with 1.19.12
`(("ghc-happy" ,ghc-happy)
("ghc-hunit" ,ghc-hunit)
("ghc-hspec" ,ghc-hspec)
("hspec-discover" ,hspec-discover)
@ -127,10 +112,78 @@
(arguments
`(;; Tests require npm
#:tests? #f
#:configure-flags '("--flags=release")))
#:configure-flags '("--flags=release")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'update-constraints
(lambda _
(substitute* "purescript.cabal"
(("\\b(ansi-terminal|cryptonite|dlist|language-javascript)\\s+[^,]+" all dep)
dep)))))))
(home-page "https://www.purescript.org/")
(synopsis "Haskell inspired programming language compiling to JavaScript")
(description
"Purescript is a small strongly, statically typed programming language with
expressive types, inspired by Haskell and compiling to JavaScript.")
(license license:bsd-3)))
(define-public ghc-purescript-cst
(package
(name "ghc-purescript-cst")
(version "0.4.0.0")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/purescript-cst/purescript-cst-"
version
".tar.gz"))
(sha256
(base32 "0r3f5lr9lrv9wpgkwj6nyl42lvxryj2lvr1w7ld4gki8ylq24n8g"))))
(build-system haskell-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'configure 'update-constraints
(lambda _
(substitute* "purescript-cst.cabal"
(("\\b(dlist)\\s+[^,]+" all dep)
dep)))))))
(inputs
`(("ghc-aeson" ,ghc-aeson)
("ghc-base-compat" ,ghc-base-compat)
("ghc-dlist" ,ghc-dlist)
("ghc-microlens" ,ghc-microlens)
("ghc-protolude" ,ghc-protolude)
("ghc-scientific" ,ghc-scientific)
("ghc-semigroups" ,ghc-semigroups)
("ghc-serialise" ,ghc-serialise)
("ghc-vector" ,ghc-vector)))
(native-inputs `(("ghc-happy" ,ghc-happy)))
(home-page "https://www.purescript.org/")
(synopsis "PureScript Programming Language Concrete Syntax Tree")
(description
"This package implements parser for the PureScript programming language.")
(license license:bsd-3)))
(define-public ghc-optparse-applicative-0.15.1.0
(package
(inherit ghc-optparse-applicative)
(name "ghc-optparse-applicative")
(version "0.15.1.0")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/optparse-applicative/optparse-applicative-"
version
".tar.gz"))
(sha256
(base32 "1ws6y3b3f6hsgv0ff0yp6lw4hba1rps4dnvry3yllng0s5gngcsd"))))
(inputs
`(("ghc-transformers-compat" ,ghc-transformers-compat)
("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint)))
(native-inputs `(("ghc-quickcheck" ,ghc-quickcheck)))
(arguments
`(#:cabal-revision
("1" "0zmhqkd96v2z1ilhqdkd9z4jgsnsxb8yi2479ind8m5zm9363zr9")))))

3
gnu/packages/python-xyz.scm
View File

@ -25696,8 +25696,7 @@ By default it uses the open Python vulnerability database Safety DB.")
"1zvn9764cf7kkjkmr9gw6wc8adpk06qxr1rhxwa9pg0zmdvrk90l"))))
(build-system python-build-system)
(inputs
`(("pandoc" ,pandoc)
("pandoc-citeproc" ,pandoc-citeproc)))
`(("pandoc" ,pandoc)))
(propagated-inputs
`(("wheel" ,python-wheel)))
(native-inputs

3
gnu/packages/statistics.scm
View File

@ -2761,8 +2761,7 @@ certain criterion, e.g., it contains a certain regular file.")
("r-tinytex" ,r-tinytex)
("r-xfun" ,r-xfun)
("r-yaml" ,r-yaml)
("pandoc" ,pandoc)
("pandoc-citeproc" ,pandoc-citeproc)))
("pandoc" ,pandoc)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(home-page "https://rmarkdown.rstudio.com")

15
gnu/packages/wm.scm
View File

@ -712,13 +712,16 @@ desktop environment.")
(build-system haskell-build-system)
(inputs
`(("ghc-extensible-exceptions" ,ghc-extensible-exceptions)
("ghc-data-default" ,ghc-data-default)
("ghc-quickcheck" ,ghc-quickcheck)
("ghc-semigroups" ,ghc-semigroups)
("ghc-setlocale" ,ghc-setlocale)
("ghc-utf8-string" ,ghc-utf8-string)
("ghc-x11" ,ghc-x11)))
(arguments
`(#:phases
`(#:cabal-revision
("1" "0yqh96qqphllr0zyz5j93cij5w2qvf39xxnrb52pz0qz3pywz9wd")
#:phases
(modify-phases %standard-phases
(add-after
'install 'install-xsession
@ -749,14 +752,14 @@ tiled on several screens.")
(define-public xmobar
(package
(name "xmobar")
(version "0.34")
(version "0.39")
(source (origin
(method url-fetch)
(uri (string-append "mirror://hackage/package/xmobar/"
(uri (string-append "https://hackage.haskell.org/package/xmobar/"
"xmobar-" version ".tar.gz"))
(sha256
(base32
"0x09xbz7y9ay0046j1xpr9jjk5jqivqi06vm3q6mhcrgc4y922rx"))))
"1k1n3ff0ikdmfq0mi8r2vpqg1iq6hsw1drvxps6k98rvvn87pws6"))))
(build-system haskell-build-system)
(native-inputs
`(("ghc-hspec" ,ghc-hspec)
@ -771,6 +774,7 @@ tiled on several screens.")
("ghc-http-types" ,ghc-http-types)
("ghc-iwlib" ,ghc-iwlib)
("ghc-libmpd" ,ghc-libmpd)
("ghc-netlink" ,ghc-netlink)
("ghc-old-locale" ,ghc-old-locale)
("ghc-parsec-numbers" ,ghc-parsec-numbers)
("ghc-regex-compat" ,ghc-regex-compat)
@ -832,6 +836,9 @@ particular, it displays commonly-chosen options before uncommon ones.")
(sha256
(base32 "1pddgkvnbww28wykncc7j0yb0lv15bk7xnnhdcbrwkxzw66w6wmd"))))
(build-system haskell-build-system)
(arguments
`(#:cabal-revision
("1" "0vimkby2gq6sgzxzbvz67caba609xqlv2ii2gi8a1cjrnn6ib011")))
(propagated-inputs
`(("ghc-old-time" ,ghc-old-time)
("ghc-random" ,ghc-random)