Merge branch 'master' into staging

This commit is contained in:
Marius Bakke 2019-08-08 18:14:45 +02:00
commit 36f400f616
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
20 changed files with 887 additions and 478 deletions

View file

@ -238,6 +238,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/haskell-check.scm \
%D%/packages/haskell-crypto.scm \
%D%/packages/haskell-web.scm \
%D%/packages/haskell-xyz.scm \
%D%/packages/ham-radio.scm \
%D%/packages/hexedit.scm \
%D%/packages/hugs.scm \

View file

@ -64,9 +64,7 @@ (define-public agda
("ghc-uri-encode" ,ghc-uri-encode)
("ghc-parallel" ,ghc-parallel)
("ghc-regex-tdfa" ,ghc-regex-tdfa)
("ghc-stm" ,ghc-stm)
("ghc-strict" ,ghc-strict)
("ghc-text" ,ghc-text)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-zlib" ,ghc-zlib)))
(arguments

View file

@ -7691,13 +7691,13 @@ (define-public r-biomart
(define-public r-biocparallel
(package
(name "r-biocparallel")
(version "1.18.0")
(version "1.18.1")
(source (origin
(method url-fetch)
(uri (bioconductor-uri "BiocParallel" version))
(sha256
(base32
"0v8rhf3hbgb3v32h2pmsv1y6q2x4airmpp50fk7z6ardcn4aza7x"))))
"1j6wbls4qgvi5gj99c51r00jhxrzxk3x3258wg7dcjzbfqypvyw3"))))
(properties
`((upstream-name . "BiocParallel")))
(build-system r-build-system)
@ -10425,14 +10425,14 @@ (define-public r-hitc
(define-public r-hdf5array
(package
(name "r-hdf5array")
(version "1.12.1")
(version "1.12.2")
(source
(origin
(method url-fetch)
(uri (bioconductor-uri "HDF5Array" version))
(sha256
(base32
"0n8zc1x582vwb0zfhrjmnqbnpqky9zbhjc2j836i0a4yisklwdcp"))))
"0afradisrr5gn0lf2kxjw55vdm3lm9mlgx53qlr9r40c1hrydpf5"))))
(properties `((upstream-name . "HDF5Array")))
(build-system r-build-system)
(inputs
@ -13964,13 +13964,11 @@ (define-public ngless
("ghc-intervalmap" ,ghc-intervalmap)
("ghc-missingh" ,ghc-missingh)
("ghc-optparse-applicative" ,ghc-optparse-applicative)
("ghc-parsec" ,ghc-parsec)
("ghc-regex" ,ghc-regex)
("ghc-safe" ,ghc-safe)
("ghc-safeio" ,ghc-safeio)
("ghc-strict" ,ghc-strict)
("ghc-tar" ,ghc-tar)
("ghc-text" ,ghc-text)
("ghc-unliftio" ,ghc-unliftio)
("ghc-unliftio-core" ,ghc-unliftio-core)
("ghc-vector" ,ghc-vector)
@ -14829,3 +14827,171 @@ (define-public tbsp
alternative method to detect significant, cell type specific sequence
mutations from scRNA-Seq data.")
(license license:expat))))
(define-public tabixpp
(package
(name "tabixpp")
(version "1.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ekg/tabixpp")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "08vx6nsipk971cyr8z53rnzwkvlld63kcn1fw0pwddynz91xfny8"))))
(build-system gnu-build-system)
(inputs
`(("htslib" ,htslib)
("zlib" ,zlib)))
(arguments
`(#:tests? #f ; There are no tests to run.
#:phases
(modify-phases %standard-phases
(delete 'configure) ; There is no configure phase.
;; The build phase needs overriding the location of htslib.
(replace 'build
(lambda* (#:key inputs #:allow-other-keys)
(let ((htslib-ref (assoc-ref inputs "htslib")))
(invoke "make"
(string-append "HTS_LIB=" htslib-ref "/lib/libhts.a")
"HTS_HEADERS=" ; No need to check for headers here.
(string-append "LIBPATH=-L. -L" htslib-ref "/include")))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin")))
(install-file "tabix++" bin))
#t)))))
(home-page "https://github.com/ekg/tabixpp")
(synopsis "C++ wrapper around tabix project")
(description "This is a C++ wrapper around the Tabix project which abstracts
some of the details of opening and jumping in tabix-indexed files.")
(license license:expat)))
(define-public smithwaterman
;; TODO: Upgrading smithwaterman breaks FreeBayes.
(let ((commit "203218b47d45ac56ef234716f1bd4c741b289be1"))
(package
(name "smithwaterman")
(version (string-append "0-1." (string-take commit 7)))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ekg/smithwaterman/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0z9xsmsv452kgdfbbwydyc6nymg3fwyv8zswls8qjin3r4ia4415"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; There are no tests to run.
#:phases
(modify-phases %standard-phases
(delete 'configure) ; There is no configure phase.
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin")))
(install-file "smithwaterman" bin))
#t)))))
(home-page "https://github.com/ekg/smithwaterman")
(synopsis "Implementation of the Smith-Waterman algorithm")
(description "Implementation of the Smith-Waterman algorithm.")
;; The licensing terms are unclear: https://github.com/ekg/smithwaterman/issues/9.
(license (list license:gpl2 license:expat)))))
(define-public multichoose
(package
(name "multichoose")
(version "1.0.3")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ekg/multichoose/")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0ci5fqvmpamwgxvmyd79ygj6n3bnbl3vc7b6h1sxz58186sm3pfs"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; Tests require node.
#:phases
(modify-phases %standard-phases
(delete 'configure) ; There is no configure phase.
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin")))
;; TODO: There are Python modules for these programs too.
(install-file "multichoose" bin)
(install-file "multipermute" bin))
#t)))))
(home-page "https://github.com/ekg/multichoose")
(synopsis "Efficient loopless multiset combination generation algorithm")
(description "This library implements an efficient loopless multiset
combination generation algorithm which is (approximately) described in
\"Loopless algorithms for generating permutations, combinations, and other
combinatorial configurations.\", G. Ehrlich - Journal of the ACM (JACM),
1973. (Algorithm 7.)")
(license license:expat)))
(define-public fsom
(let ((commit "a6ef318fbd347c53189384aef7f670c0e6ce89a3"))
(package
(name "fsom")
(version (git-version "0.0.0" "1" commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ekg/fsom/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0gw1lpvr812pywg9y546x0h1hhj261xwls41r6kqhddjlrcjc0pi"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; There are no tests to run.
#:phases
(modify-phases %standard-phases
(delete 'configure) ; There is no configure phase.
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin")))
(install-file "fsom" bin))
#t)))))
(home-page "https://github.com/ekg/fsom")
(synopsis "Manage SOM (Self-Organizing Maps) neural networks")
(description "A tiny C library for managing SOM (Self-Organizing Maps)
neural networks.")
(license license:gpl3))))
(define-public fastahack
(let ((commit "c68cebb4f2e5d5d2b70cf08fbdf1944e9ab2c2dd"))
(package
(name "fastahack")
(version (git-version "0.0.0" "1" commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ekg/fastahack/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0hfdv67l9g611i2ck4l92pd6ygmsp9g1ph4zx1ni7qkpsikf0l19"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; Unclear how to run tests: https://github.com/ekg/fastahack/issues/15
#:phases
(modify-phases %standard-phases
(delete 'configure) ; There is no configure phase.
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin")))
(install-file "fastahack" bin))
#t)))))
(home-page "https://github.com/ekg/fastahack")
(synopsis "Indexing and sequence extraction from FASTA files")
(description "Fastahack is a small application for indexing and
extracting sequences and subsequences from FASTA files. The included library
provides a FASTA reader and indexer that can be embedded into applications
which would benefit from directly reading subsequences from FASTA files. The
library automatically handles index file generation and use.")
(license (list license:expat license:gpl2)))))

View file

@ -420,21 +420,21 @@ (define-public r-readxl
(define-public r-modelr
(package
(name "r-modelr")
(version "0.1.4")
(version "0.1.5")
(source
(origin
(method url-fetch)
(uri (cran-uri "modelr" version))
(sha256
(base32
"1ngxphbjkv7yl1rg30sj36mfwhc76g452drjrq9abgab4k0pgnml"))))
"0nnfhlzz75ihs8azy963cc4cwg1kx81rybk4z3wm98bbghwfxfs5"))))
(build-system r-build-system)
(propagated-inputs
`(("r-broom" ,r-broom)
("r-dplyr" ,r-dplyr)
("r-lazyeval" ,r-lazyeval)
("r-magrittr" ,r-magrittr)
("r-purrr" ,r-purrr)
("r-rlang" ,r-rlang)
("r-tibble" ,r-tibble)
("r-tidyr" ,r-tidyr)))
(home-page "https://github.com/tidyverse/modelr")
@ -5544,14 +5544,14 @@ (define-public r-ggsci
(define-public r-ggsignif
(package
(name "r-ggsignif")
(version "0.5.0")
(version "0.6.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "ggsignif" version))
(sha256
(base32
"0z04g5kqdj66fyfxb5d2m7njkqd7idbiy4xgsnxdh5pbh3cr643x"))))
"17j9hg967k1wp9xw3x84mqss58jkb8pvlrnlchz4i1hklgykxqbg"))))
(build-system r-build-system)
(propagated-inputs
`(("r-ggplot2" ,r-ggplot2)))

View file

@ -853,27 +853,27 @@ (define-public postgresql-11
(package
(inherit postgresql)
(name "postgresql")
(version "11.4")
(version "11.5")
(source (origin
(method url-fetch)
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
"12ycjlqncijgmd5z078ybwda8ilas96lc7nxxmdq140mzpgjv002"))))))
"106ikalvrilihlvhq7xj7snq98hgbgq6qsgjrd252wgw1c327pvz"))))))
(define-public postgresql-9.6
(package
(inherit postgresql)
(name "postgresql")
(version "9.6.14")
(version "9.6.15")
(source (origin
(method url-fetch)
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
"08hsqczy1ixkjyf2vr3s9x69agfz9yr8lh31fir4z0dfr5jw421z"))))))
"02hp69h2p02asfblkaahblzdz2zmawd2r11h6237y5j7yadgxn9w"))))))
(define-public python-pymysql
(package

View file

@ -718,7 +718,7 @@ (define-public weston
(define-public exempi
(package
(name "exempi")
(version "2.5.0")
(version "2.5.1")
(source (origin
(method url-fetch)
(uri (string-append
@ -726,7 +726,7 @@ (define-public exempi
name "-" version ".tar.bz2"))
(sha256
(base32
"06vi7dc2gappwqm3xpfyy5ihxq14bmvj3bd47yk482jlq0jgr0nw"))))
"1j4vx054l1c2cggw4aka4iw48jkcf68qk5y064pbqw1k3ddks2qh"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags (list (string-append "--with-boost="
@ -736,7 +736,7 @@ (define-public exempi
(inputs
`(("expat" ,expat)
("zlib" ,zlib)))
(home-page "https://wiki.freedesktop.org/libopenraw/Exempi")
(home-page "https://libopenraw.freedesktop.org/exempi/")
(synopsis "XMP metadata handling library")
(description "Exempi is an implementation of the Extensible Metadata
Platform (@dfn{XMP}), which enables embedding metadata in PDF and image

View file

@ -4977,6 +4977,10 @@ (define-public tome4
("luajit" ,luajit)))
(arguments
`(#:make-flags '("CC=gcc" "config=release")
;; XXX: Building in parallel occasionally causes this build failure:
;; ../src/luajit2/src/host/buildvm.c:73:10: fatal error: buildvm_arch.h:
;; No such file or directory
#:parallel-build? #f
#:phases (modify-phases %standard-phases
(delete 'bootstrap)
(replace 'configure

View file

@ -5535,6 +5535,57 @@ (define-public network-manager-vpnc
(license license:gpl2+)
(properties `((upstream-name . "NetworkManager-vpnc")))))
(define-public network-manager-openconnect
(package
(name "network-manager-openconnect")
(version "1.2.6")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://gnome/sources/NetworkManager-openconnect/"
(version-major+minor version)
"/NetworkManager-openconnect-" version ".tar.xz"))
(sha256
(base32
"0nlp290nkawc4wqm978n4vhzg3xdqi8kpjjx19l855vab41rh44m"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--enable-absolute-paths" "--localstatedir=/var")
#:phases
(modify-phases %standard-phases
(add-after 'configure 'patch-path
(lambda* (#:key inputs outputs #:allow-other-keys #:rest args)
(let* ((openconnect (string-append (assoc-ref inputs "openconnect")
"/sbin/openconnect"))
(modprobe (string-append (assoc-ref inputs "kmod")
"/bin/modprobe"))
(pretty-ovpn (string-append "\"" openconnect "\"")))
(substitute* "src/nm-openconnect-service.c"
(("\"/usr/local/sbin/openconnect\"") pretty-ovpn)
(("\"/usr/sbin/openconnect\"") pretty-ovpn)
(("/sbin/modprobe") modprobe)))
#t)))))
(native-inputs
`(("intltool" ,intltool)
("network-manager-applet" ,network-manager-applet) ;for libnma
("pkg-config" ,pkg-config)))
(inputs
`(("gcr" ,gcr)
("gtk+" ,gtk+)
("kmod" ,kmod)
("libsecret" ,libsecret)
("libxml2" ,libxml2)
("network-manager" ,network-manager)
("openconnect" ,openconnect)))
(home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN")
(synopsis "OpenConnect plug-in for NetworkManager")
(description
"This extension of NetworkManager allows it to take care of connections
to @acronym{VPNs, virtual private networks} via OpenConnect, an open client for
Cisco's AnyConnect SSL VPN.")
(license license:gpl2+)
(properties `((upstream-name . "NetworkManager-openconnect")))))
(define-public mobile-broadband-provider-info
(package
(name "mobile-broadband-provider-info")

View file

@ -99,7 +99,6 @@ (define-public darcs
("ghc-html" ,ghc-html)
("ghc-mmap" ,ghc-mmap)
("ghc-old-time" ,ghc-old-time)
("ghc-parsec" ,ghc-parsec)
("ghc-random" ,ghc-random)
("ghc-regex-applicative" ,ghc-regex-applicative)
("ghc-regex-compat-tdfa" ,ghc-regex-compat-tdfa)
@ -242,10 +241,8 @@ (define-public git-annex
("ghc-securemem" ,ghc-securemem)
("ghc-socks" ,ghc-socks)
("ghc-split" ,ghc-split)
("ghc-stm" ,ghc-stm)
("ghc-stm-chans" ,ghc-stm-chans)
("ghc-tagsoup" ,ghc-tagsoup)
("ghc-text" ,ghc-text)
("ghc-unix-compat" ,ghc-unix-compat)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-utf8-string" ,ghc-utf8-string)
@ -285,7 +282,6 @@ (define-public ghc-sdl2
`(("ghc-exceptions" ,ghc-exceptions)
("ghc-linear" ,ghc-linear)
("ghc-statevar" ,ghc-statevar)
("ghc-text" ,ghc-text)
("ghc-vector" ,ghc-vector)
("sdl2" ,sdl2)))
(native-inputs
@ -347,7 +343,6 @@ (define-public ghc-sdl2-image
(build-system haskell-build-system)
(inputs
`(("ghc-sdl2" ,ghc-sdl2)
("ghc-text" ,ghc-text)
("sdl2-image" ,sdl2-image)))
(native-inputs
`(("pkg-config" ,pkg-config)))

View file

@ -54,7 +54,6 @@ (define-public ghc-tasty-ant-xml
(inputs
`(("ghc-generic-deriving" ,ghc-generic-deriving)
("ghc-xml" ,ghc-xml)
("ghc-stm" ,ghc-stm)
("ghc-tagged" ,ghc-tagged)
("ghc-tasty" ,ghc-tasty)))
(home-page
@ -170,8 +169,7 @@ (define-public ghc-tasty
"14riid753hjqr6lca1kgxpnvq0wykf0k3qc5jpag42hh8bszav22"))))
(build-system haskell-build-system)
(inputs
`(("ghc-stm" ,ghc-stm)
("ghc-tagged" ,ghc-tagged)
`(("ghc-tagged" ,ghc-tagged)
("ghc-regex-tdfa" ,ghc-regex-tdfa)
("ghc-optparse-applicative" ,ghc-optparse-applicative)
("ghc-unbounded-delays" ,ghc-unbounded-delays)
@ -277,7 +275,6 @@ (define-public ghc-tasty-rerun
`(("ghc-optparse-applicative" ,ghc-optparse-applicative)
("ghc-reducers" ,ghc-reducers)
("ghc-split" ,ghc-split)
("ghc-stm" ,ghc-stm)
("ghc-tagged" ,ghc-tagged)
("ghc-tasty" ,ghc-tasty)))
(home-page "https://github.com/ocharles/tasty-rerun")
@ -340,7 +337,6 @@ (define-public ghc-quickcheck-instances
("ghc-old-time" ,ghc-old-time)
("ghc-scientific" ,ghc-scientific)
("ghc-tagged" ,ghc-tagged)
("ghc-text" ,ghc-text)
("ghc-transformers-compat" ,ghc-transformers-compat)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-uuid-types" ,ghc-uuid-types)
@ -815,7 +811,7 @@ (define-public ghc-hedgehog
"0xz10ycdm5vk9nrcym1fi83k19frfwqz18bz8bnpzwvaj0j41yfj"))))
(build-system haskell-build-system)
(inputs
`(("ghc-ansi-terminal" ,ghc-ansi-terminal-0.8)
`(("ghc-ansi-terminal" ,ghc-ansi-terminal)
("ghc-async" ,ghc-async)
("ghc-concurrent-output" ,ghc-concurrent-output)
("ghc-exceptions" ,ghc-exceptions)
@ -827,7 +823,6 @@ (define-public ghc-hedgehog
("ghc-random" ,ghc-random)
("ghc-resourcet" ,ghc-resourcet)
("ghc-semigroups" ,ghc-semigroups)
("ghc-stm" ,ghc-stm)
("ghc-th-lift" ,ghc-th-lift)
("ghc-transformers-base" ,ghc-transformers-base)
("ghc-wl-pprint-annotated"

View file

@ -25,6 +25,8 @@ (define-module (gnu packages haskell-crypto)
#:use-module (gnu packages compression)
#:use-module (gnu packages haskell)
#:use-module (gnu packages haskell-check)
#:use-module (gnu packages haskell-xyz)
#:use-module (gnu packages tls)
#:use-module (guix build-system haskell)
#:use-module (guix download)
#:use-module ((guix licenses) #:prefix license:)
@ -69,8 +71,7 @@ (define-public ghc-asn1-encoding
(build-system haskell-build-system)
(inputs
`(("ghc-hourglass" ,ghc-hourglass)
("ghc-asn1-types" ,ghc-asn1-types)
("ghc-text" ,ghc-text)))
("ghc-asn1-types" ,ghc-asn1-types)))
(native-inputs
`(("ghc-tasty" ,ghc-tasty)
("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)))
@ -776,3 +777,64 @@ (define-public ghc-tls
extensions.")
(license license:bsd-3)))
(define-public ghc-hsopenssl
(package
(name "ghc-hsopenssl")
(version "0.11.4.15")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"HsOpenSSL/HsOpenSSL-" version ".tar.gz"))
(sha256
(base32
"0idmak6d8mpbxphyq9hkxkmby2wnzhc1phywlgm0zw6q47pwxgff"))))
(build-system haskell-build-system)
(inputs
`(("ghc-network" ,ghc-network)
("openssl" ,openssl)))
(arguments
`(#:cabal-revision
("1" "0bkcw2pjfgv1bhgkrpncvwq9czfr7cr4ak14n0v8c2y33i33wk5z")))
(home-page "https://github.com/vshabanov/HsOpenSSL")
(synopsis "Partial OpenSSL binding for Haskell")
(description "HsOpenSSL is an OpenSSL binding for Haskell. It can
generate RSA and DSA keys, read and write PEM files, generate message
digests, sign and verify messages, encrypt and decrypt messages. It has
also some capabilities of creating SSL clients and servers. This
package is in production use by a number of Haskell based systems and
stable. You may also be interested in the tls package,
@uref{http://hackage.haskell.org/package/tls}, which is a pure Haskell
implementation of SSL.")
(license license:public-domain)))
(define-public ghc-openssl-streams
(package
(name "ghc-openssl-streams")
(version "1.2.1.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"openssl-streams/openssl-streams-"
version ".tar.gz"))
(sha256
(base32
"0pwghr7ygv59k572xsj1j97rilkbjz66qaiyj0ra2wfg6pl70wfw"))))
(build-system haskell-build-system)
(inputs
`(("ghc-hsopenssl" ,ghc-hsopenssl)
("ghc-io-streams" ,ghc-io-streams)
("ghc-network" ,ghc-network)))
(native-inputs
`(("ghc-hunit" ,ghc-hunit)
("ghc-test-framework" ,ghc-test-framework)
("ghc-test-framework-hunit" ,ghc-test-framework-hunit)))
(arguments
`(#:cabal-revision
("2" "1004kgdryflpkp19dv4ikilhcn0xbfc5dsp6v3ib34580pcfj7wy")))
(home-page "http://hackage.haskell.org/package/openssl-streams")
(synopsis "OpenSSL network support for io-streams")
(description "This library contains io-streams routines for secure
networking using OpenSSL (by way of HsOpenSSL).")
(license license:bsd-3)))

View file

@ -28,6 +28,7 @@ (define-module (gnu packages haskell-web)
#:use-module (gnu packages haskell)
#:use-module (gnu packages haskell-check)
#:use-module (gnu packages haskell-crypto)
#:use-module (gnu packages haskell-xyz)
#:use-module (guix build-system haskell)
#:use-module (guix download)
#:use-module ((guix licenses) #:prefix license:)
@ -47,7 +48,6 @@ (define-public ghc-tagsoup
(base32
"1yv3dbyb0i1yqm796jgc4jj5kxkla1sxb3b2klw5ks182kdx8kjb"))))
(build-system haskell-build-system)
(inputs `(("ghc-text" ,ghc-text)))
(native-inputs
`(("ghc-quickcheck" ,ghc-quickcheck)))
(home-page "http://community.haskell.org/~ndm/tagsoup/")
@ -80,7 +80,6 @@ (define-public ghc-cookie
(inputs
`(("ghc-old-locale" ,ghc-old-locale)
("ghc-blaze-builder" ,ghc-blaze-builder)
("ghc-text" ,ghc-text)
("ghc-data-default-class" ,ghc-data-default-class)
("ghc-hunit" ,ghc-hunit)
("ghc-quickcheck" ,ghc-quickcheck)
@ -136,8 +135,7 @@ (define-public ghc-http-types
("ghc-quickcheck-instances" ,ghc-quickcheck-instances)
("hspec-discover" ,hspec-discover)))
(inputs
`(("ghc-case-insensitive" ,ghc-case-insensitive)
("ghc-text" ,ghc-text)))
`(("ghc-case-insensitive" ,ghc-case-insensitive)))
(home-page "https://github.com/aristidb/http-types")
(synopsis "Generic HTTP types for Haskell")
(description "This package provides generic HTTP types for Haskell (for
@ -169,7 +167,6 @@ (define-public ghc-http
("ghc-conduit-extra" ,ghc-conduit-extra)
("ghc-http-types" ,ghc-http-types)
("ghc-old-time" ,ghc-old-time)
("ghc-parsec" ,ghc-parsec)
("ghc-puremd5" ,ghc-puremd5)
("ghc-network" ,ghc-network)
("ghc-network-uri" ,ghc-network-uri)
@ -215,7 +212,6 @@ (define-public ghc-http-client
("ghc-network-uri" ,ghc-network-uri)
("ghc-random" ,ghc-random)
("ghc-streaming-commons" ,ghc-streaming-commons)
("ghc-text" ,ghc-text)
("ghc-zlib" ,ghc-zlib)))
(native-inputs
`(("ghc-hspec" ,ghc-hspec)))
@ -308,13 +304,12 @@ (define-public ghc-http2
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-vector" ,ghc-vector)
("ghc-word8" ,ghc-word8)
("ghc-psqueues" ,ghc-psqueues)
("ghc-stm" ,ghc-stm)))
(native-inputs
`(("ghc-glob" ,ghc-glob)
("ghc-hspec" ,ghc-hspec)
("ghc-doctest" ,ghc-doctest)
("hspec-discover" ,hspec-discover)))
("ghc-psqueues" ,ghc-psqueues)))
(native-inputs
`(("ghc-glob" ,ghc-glob)
("ghc-hspec" ,ghc-hspec)
("ghc-doctest" ,ghc-doctest)
("hspec-discover" ,hspec-discover)))
(home-page "https://github.com/kazu-yamamoto/http2")
(synopsis "HTTP/2 library including frames, priority queues and HPACK")
(description "This package provides a HTTP/2.0 library including frames
@ -358,7 +353,6 @@ (define-public ghc-http-conduit
("ghc-connection" ,ghc-connection)
("ghc-warp-tls" ,ghc-warp-tls)
("ghc-blaze-builder" ,ghc-blaze-builder)
("ghc-text" ,ghc-text)
("ghc-conduit" ,ghc-conduit)
("ghc-utf8-string" ,ghc-utf8-string)
("ghc-case-insensitive" ,ghc-case-insensitive)
@ -402,7 +396,6 @@ (define-public ghc-wai
("ghc-vault" ,ghc-vault)
("ghc-blaze-builder" ,ghc-blaze-builder)
("ghc-network" ,ghc-network)
("ghc-text" ,ghc-text)
("ghc-http-types" ,ghc-http-types)))
(native-inputs
`(("hspec-discover" ,hspec-discover)
@ -482,7 +475,6 @@ (define-public ghc-wai-extra
("ghc-void" ,ghc-void)
("ghc-wai" ,ghc-wai)
("ghc-http-types" ,ghc-http-types)
("ghc-text" ,ghc-text)
("ghc-case-insensitive" ,ghc-case-insensitive)
("ghc-data-default-class" ,ghc-data-default-class)
("ghc-unix-compat" ,ghc-unix-compat)
@ -569,9 +561,7 @@ (define-public ghc-warp
("ghc-http-types" ,ghc-http-types)
("ghc-iproute" ,ghc-iproute)
("ghc-network" ,ghc-network)
("ghc-stm" ,ghc-stm)
("ghc-streaming-commons" ,ghc-streaming-commons)
("ghc-text" ,ghc-text)
("ghc-unix-compat" ,ghc-unix-compat)
("ghc-vault" ,ghc-vault)
("ghc-wai" ,ghc-wai)
@ -670,8 +660,7 @@ (define-public ghc-xss-sanitize
("ghc-css-text" ,ghc-css-text)
("ghc-network-uri" ,ghc-network-uri)))
(native-inputs
`(("ghc-text" ,ghc-text)
("ghc-attoparsec" ,ghc-attoparsec)
`(("ghc-attoparsec" ,ghc-attoparsec)
("ghc-hspec" ,ghc-hspec)
("ghc-hunit" ,ghc-hunit)))
(home-page "https://github.com/yesodweb/haskell-xss-sanitize")
@ -697,8 +686,7 @@ (define-public ghc-css-text
"0ynd9f4hn2sfwqzbsa0y7phmxq8za7jiblpjwx0ry8b372zhgxaz"))))
(build-system haskell-build-system)
(inputs
`(("ghc-text" ,ghc-text)
("ghc-attoparsec" ,ghc-attoparsec)
`(("ghc-attoparsec" ,ghc-attoparsec)
("ghc-hspec" ,ghc-hspec)
("ghc-quickcheck" ,ghc-quickcheck)))
(home-page "http://www.yesodweb.com/")
@ -720,8 +708,6 @@ (define-public ghc-mime-types
(base32
"14ccl2842ya17zyj0bpc7vzklbyqvvydpbypn69h2fmhgji192x8"))))
(build-system haskell-build-system)
(inputs
`(("ghc-text" ,ghc-text)))
(home-page "https://github.com/yesodweb/wai")
(synopsis "Basic MIME type handling types and functions")
(description
@ -751,28 +737,6 @@ (define-public ghc-html
documents.")
(license license:bsd-3)))
(define-public ghc-xhtml
(package
(name "ghc-xhtml")
(version "3000.2.2.1")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/xhtml/xhtml-"
version
".tar.gz"))
(sha256
(base32
"0939kwpinq6l4n3nyvd1gzyl7f83gymw0wzqndlgy1yc7q0nkj2w"))))
(build-system haskell-build-system)
(home-page "https://github.com/haskell/xhtml")
(synopsis "XHTML combinator library")
(description
"This package provides combinators for producing XHTML 1.0, including the
Strict, Transitional and Frameset variants.")
(license license:bsd-3)))
(define-public ghc-blaze-html
(package
(name "ghc-blaze-html")
@ -789,7 +753,6 @@ (define-public ghc-blaze-html
(build-system haskell-build-system)
(inputs
`(("ghc-blaze-builder" ,ghc-blaze-builder)
("ghc-text" ,ghc-text)
("ghc-blaze-markup" ,ghc-blaze-markup)))
(native-inputs
`(("ghc-hunit" ,ghc-hunit)
@ -825,7 +788,6 @@ (define-public ghc-aeson
("ghc-hashable" ,ghc-hashable)
("ghc-scientific" ,ghc-scientific)
("ghc-tagged" ,ghc-tagged)
("ghc-text" ,ghc-text)
("ghc-th-abstraction" ,ghc-th-abstraction)
("ghc-time-locale-compat" ,ghc-time-locale-compat)
("ghc-unordered-containers" ,ghc-unordered-containers)
@ -867,7 +829,6 @@ (define-public ghc-aeson-pretty
("ghc-base-compat" ,ghc-base-compat)
("ghc-scientific" ,ghc-scientific)
("ghc-vector" ,ghc-vector)
("ghc-text" ,ghc-text)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-attoparsec" ,ghc-attoparsec)
("ghc-cmdargs" ,ghc-cmdargs)))
@ -897,12 +858,10 @@ (define-public ghc-aeson-qq
(build-system haskell-build-system)
(inputs
`(("ghc-base-compat" ,ghc-base-compat)
("ghc-text" ,ghc-text)
("ghc-attoparsec" ,ghc-attoparsec)
("ghc-scientific" ,ghc-scientific)
("ghc-vector" ,ghc-vector)
("ghc-aeson" ,ghc-aeson)
("ghc-parsec" ,ghc-parsec)
("ghc-haskell-src-meta" ,ghc-haskell-src-meta)))
(native-inputs
`(("ghc-hspec" ,ghc-hspec)
@ -931,8 +890,7 @@ (define-public ghc-multipart
"1x4n4yyva22dhfr1pg5ki112qvvzb4hyd7bwpm189iq4gcp52q4z"))))
(build-system haskell-build-system)
(inputs
`(("ghc-parsec" ,ghc-parsec)
("ghc-stringsearch" ,ghc-stringsearch)))
`(("ghc-stringsearch" ,ghc-stringsearch)))
(home-page
"http://www.github.com/silkapp/multipart")
(synopsis
@ -956,8 +914,7 @@ (define-public ghc-uri-encode
"11miwb5vvnn17m92ykz1pzg9x6s8fbpz3mmsyqs2s4b3mn55haz8"))))
(build-system haskell-build-system)
(inputs
`(("ghc-text" ,ghc-text)
("ghc-utf8-string" ,ghc-utf8-string)
`(("ghc-utf8-string" ,ghc-utf8-string)
("ghc-network-uri" ,ghc-network-uri)))
(home-page "https://hackage.haskell.org/package/uri-encode")
(synopsis "Unicode aware uri-encoding")
@ -978,7 +935,6 @@ (define-public ghc-path-pieces
(base32
"0vx3sivcsld76058925hym2j6hm3g71f0qjr7v59f1g2afgx82q8"))))
(build-system haskell-build-system)
(inputs `(("ghc-text" ,ghc-text)))
(native-inputs `(("ghc-hunit" ,ghc-hunit)
("ghc-hspec" ,ghc-hspec)
("ghc-quickcheck" ,ghc-quickcheck)))
@ -1067,7 +1023,6 @@ (define-public ghc-yesod-core
(build-system haskell-build-system)
(inputs `(("ghc-wai" ,ghc-wai)
("ghc-extra" ,ghc-extra)
("ghc-text" ,ghc-text)
("ghc-shakespeare" ,ghc-shakespeare)
("ghc-blaze-builder" ,ghc-blaze-builder)
("ghc-clientsession" ,ghc-clientsession)
@ -1081,7 +1036,6 @@ (define-public ghc-yesod-core
("ghc-cookie" ,ghc-cookie)
("ghc-http-types" ,ghc-http-types)
("ghc-case-insensitive" ,ghc-case-insensitive)
("ghc-parsec" ,ghc-parsec)
("ghc-vector" ,ghc-vector)
("ghc-aeson" ,ghc-aeson)
("ghc-fast-logger" ,ghc-fast-logger)
@ -1147,8 +1101,7 @@ (define-public ghc-yesod-persistent
(native-inputs `(("ghc-hspec" ,ghc-hspec)
("ghc-wai-extra" ,ghc-wai-extra)
("ghc-yesod-core" ,ghc-yesod-core)
("ghc-persistent-sqlite" ,ghc-persistent-sqlite)
("ghc-text" ,ghc-text)))
("ghc-persistent-sqlite" ,ghc-persistent-sqlite)))
(home-page "http://www.yesodweb.com/")
(synopsis "Helpers for using Persistent from Yesod")
(description "This Haskell package provides helpers for using Persistent
@ -1179,7 +1132,6 @@ (define-public ghc-yesod-form
("ghc-xss-sanitize" ,ghc-xss-sanitize)
("ghc-blaze-builder" ,ghc-blaze-builder)
("ghc-email-validate" ,ghc-email-validate)
("ghc-text" ,ghc-text)
("ghc-wai" ,ghc-wai)
("ghc-blaze-html" ,ghc-blaze-html)
("ghc-blaze-markup" ,ghc-blaze-markup)
@ -1226,7 +1178,6 @@ (define-public ghc-yesod
("ghc-data-default-class" ,ghc-data-default-class)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-yaml" ,ghc-yaml)
("ghc-text" ,ghc-text)
("ghc-monad-logger" ,ghc-monad-logger)
("ghc-fast-logger" ,ghc-fast-logger)
("ghc-conduit" ,ghc-conduit)
@ -1309,8 +1260,6 @@ (define-public ghc-hxt-regex-xmlschema
(build-system haskell-build-system)
(inputs
`(("ghc-hxt-charproperties" ,ghc-hxt-charproperties)
("ghc-parsec" ,ghc-parsec)
("ghc-text" ,ghc-text)
("ghc-hunit" ,ghc-hunit)))
(home-page "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema")
(synopsis "Regular expression library for W3C XML Schema regular expressions")
@ -1336,8 +1285,7 @@ (define-public ghc-hxt
"1qq3ykgn355rx242xjcbqqksgvwr6k2fdj5phw4iv28qqxff6m8d"))))
(build-system haskell-build-system)
(inputs
`(("ghc-parsec" ,ghc-parsec)
("ghc-hxt-charproperties" ,ghc-hxt-charproperties)
`(("ghc-hxt-charproperties" ,ghc-hxt-charproperties)
("ghc-hxt-unicode" ,ghc-hxt-unicode)
("ghc-hxt-regex-xmlschema" ,ghc-hxt-regex-xmlschema)
("ghc-network-uri" ,ghc-network-uri)))
@ -1347,3 +1295,171 @@ (define-public ghc-hxt
"The Haskell XML Toolbox bases on the ideas of HaXml and HXML, but
introduces a more general approach for processing XML with Haskell.")
(license license:expat)))
(define-public ghc-http-common
(package
(name "ghc-http-common")
(version "0.8.2.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"http-common/http-common-" version ".tar.gz"))
(sha256
(base32
"14s5a178sb2vm5k00rs21760mds5dz2gs10k9iyn22h01mxyf599"))))
(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-unordered-containers" ,ghc-unordered-containers)))
(home-page "https://github.com/afcowie/http-streams/")
(synopsis "Common types for HTTP clients and servers")
(description "Base types used by a variety of HTTP clients and
servers. See http-streams @code{Network.Http.Client} or pipes-http
@code{Pipes.Http.Client} for full documentation. You can import
@code{Network.Http.Types} if you like, but both http-streams and
pipes-http re-export this package's types and functions.")
(license license:bsd-3)))
(define-public ghc-http-streams
(package
(name "ghc-http-streams")
(version "0.8.6.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"http-streams/http-streams-" version ".tar.gz"))
(sha256
(base32
"18vxd35n7s3z4gjvad94bknc8z1w9d7ccgphnhsxlz5cackizmxq"))))
(build-system haskell-build-system)
(inputs
`(("ghc-attoparsec" ,ghc-attoparsec)
("ghc-base64-bytestring" ,ghc-base64-bytestring)
("ghc-blaze-builder" ,ghc-blaze-builder)
("ghc-case-insensitive" ,ghc-case-insensitive)
("ghc-io-streams" ,ghc-io-streams)
("ghc-hsopenssl" ,ghc-hsopenssl)
("ghc-openssl-streams" ,ghc-openssl-streams)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-aeson" ,ghc-aeson)
("ghc-http-common" ,ghc-http-common)
("ghc-network-uri" ,ghc-network-uri)
("ghc-network" ,ghc-network)))
(arguments
`(#:tests? #f)) ; tests rely on an outdated version of snap-server
(home-page "https://github.com/afcowie/http-streams/")
(synopsis "HTTP client using io-streams")
(description "An HTTP client using the Snap Framework's io-streams
library to handle the streaming IO. The API is optimized for ease of
use for the rather common case of code needing to query web services and
deal with the result.")
(license license:bsd-3)))
(define-public ghc-snap-core
(package
(name "ghc-snap-core")
(version "1.0.3.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"snap-core/snap-core-" version ".tar.gz"))
(sha256
(base32
"136q7l4hd5yn5hb507q1ziqx124ma1lkzh5dx0n150p8dx3rhhsc"))))
(build-system haskell-build-system)
(inputs
`(("ghc-old-locale" ,ghc-old-locale)
("ghc-hunit" ,ghc-hunit)
("ghc-attoparsec" ,ghc-attoparsec)
("ghc-bytestring-builder" ,ghc-bytestring-builder)
("ghc-case-insensitive" ,ghc-case-insensitive)
("ghc-lifted-base" ,ghc-lifted-base)
("ghc-io-streams" ,ghc-io-streams)
("ghc-hashable" ,ghc-hashable)
("ghc-monad-control" ,ghc-monad-control)
("ghc-random" ,ghc-random)
("ghc-readable" ,ghc-readable)
("ghc-regex-posix" ,ghc-regex-posix)
("ghc-transformers-base" ,ghc-transformers-base)
("ghc-unix-compat" ,ghc-unix-compat)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-vector" ,ghc-vector)
("ghc-network-uri" ,ghc-network-uri)
("ghc-network" ,ghc-network)))
(native-inputs
`(("ghc-quickcheck" ,ghc-quickcheck)
("ghc-parallel" ,ghc-parallel)
("ghc-test-framework" ,ghc-test-framework)
("ghc-test-framework-hunit" ,ghc-test-framework-hunit)
("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2)
("ghc-zlib" ,ghc-zlib)))
(arguments
`(#:cabal-revision
("3" "0wlhn33r7c9g7j23y006ddq9d87lkmianvvfrbl8jd8mvjvj2gfa")))
(home-page "http://snapframework.com/")
(synopsis "Haskell Web Framework (core interfaces and types)")
(description "Snap is a simple and fast web development framework
and server written in Haskell. For more information, you can visit the
Snap project website at @uref{http://snapframework.com/}. This library
contains the core definitions and types for the Snap framework.")
(license license:bsd-3)))
(define-public ghc-snap-server
(package
(name "ghc-snap-server")
(version "1.1.0.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"snap-server/snap-server-" version ".tar.gz"))
(sha256
(base32
"0vvw9n8xs272qdlrf3dxhnva41zh3awi7pf022rrjj75lj8a77i4"))))
(build-system haskell-build-system)
(inputs
`(("ghc-attoparsec" ,ghc-attoparsec)
("ghc-blaze-builder" ,ghc-blaze-builder)
("ghc-bytestring-builder" ,ghc-bytestring-builder)
("ghc-case-insensitive" ,ghc-case-insensitive)
("ghc-clock" ,ghc-clock)
("ghc-io-streams" ,ghc-io-streams)
("ghc-io-streams-haproxy" ,ghc-io-streams-haproxy)
("ghc-lifted-base" ,ghc-lifted-base)
("ghc-network" ,ghc-network)
("ghc-old-locale" ,ghc-old-locale)
("ghc-snap-core" ,ghc-snap-core)
("ghc-unix-compat" ,ghc-unix-compat)
("ghc-vector" ,ghc-vector)))
(native-inputs
`(("ghc-base16-bytestring" ,ghc-base16-bytestring)
("ghc-monad-control" ,ghc-monad-control)
("ghc-random" ,ghc-random)
("ghc-threads" ,ghc-threads)
("ghc-hunit" ,ghc-hunit)
("ghc-quickcheck" ,ghc-quickcheck)
("ghc-http-streams" ,ghc-http-streams)
("ghc-http-common" ,ghc-http-common)
("ghc-parallel" ,ghc-parallel)
("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
("3" "0a9d3nqb5rvgm25nak68lp6yj9m6cwhbgdbg5l7ib5i2czcg7yjh")))
(home-page "http://snapframework.com/")
(synopsis "Web server for the Snap Framework")
(description "Snap is a simple and fast web development framework
and server written in Haskell. For more information, you can visit the
Snap project website at @uref{http://snapframework.com/}. The Snap HTTP
server is a high performance web server library written in Haskell.
Together with the snap-core library upon which it depends, it provides a
clean and efficient Haskell programming interface to the HTTP
protocol.")
(license license:bsd-3)))

View file

@ -0,0 +1,276 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages haskell-xyz)
#:use-module (gnu packages)
#:use-module (gnu packages haskell)
#:use-module (gnu packages haskell-check)
#:use-module (guix build-system haskell)
#:use-module (guix download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages))
(define-public ghc-concurrent-extra
(package
(name "ghc-concurrent-extra")
(version "0.7.0.12")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"concurrent-extra/concurrent-extra-"
version ".tar.gz"))
(sha256
(base32
"1y8xk460fvnw0idzdiylmm874sjny4q9jxb1js9fjz8lw2wns3h4"))))
(build-system haskell-build-system)
(arguments
;; XXX: The ReadWriteLock 'stressTest' fails.
`(#:tests? #f))
(inputs
`(("ghc-unbounded-delays" ,ghc-unbounded-delays)))
(native-inputs
`(("ghc-async" ,ghc-async)
("ghc-hunit" ,ghc-hunit)
("ghc-random" ,ghc-random)
("ghc-test-framework" ,ghc-test-framework)
("ghc-test-framework-hunit" ,ghc-test-framework-hunit)))
(home-page "https://github.com/basvandijk/concurrent-extra")
(synopsis "Extra concurrency primitives")
(description "This Haskell library offers (among other things) the
following selection of synchronisation primitives:
@itemize
@item @code{Broadcast}: Wake multiple threads by broadcasting a value.
@item @code{Event}: Wake multiple threads by signalling an event.
@item @code{Lock}: Enforce exclusive access to a resource. Also known
as a binary semaphore or mutex. The package additionally provides an
alternative that works in the STM monad.
@item @code{RLock}: A lock which can be acquired multiple times by the
same thread. Also known as a reentrant mutex.
@item @code{ReadWriteLock}: Multiple-reader, single-writer locks. Used
to protect shared resources which may be concurrently read, but only
sequentially written.
@item @code{ReadWriteVar}: Concurrent read, sequential write variables.
@end itemize
Please consult the API documentation of the individual modules for more
detailed information.
This package was inspired by the concurrency libraries of Java and
Python.")
(license license:bsd-3)))
(define-public ghc-io-streams
(package
(name "ghc-io-streams")
(version "1.5.0.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"io-streams/io-streams-" version ".tar.gz"))
(sha256
(base32
"12rcdg2d70644bvn838fxcjkssqj8pssnx5y657si5rijcbkgjsx"))))
(build-system haskell-build-system)
(inputs
`(("ghc-attoparsec" ,ghc-attoparsec)
("ghc-bytestring-builder" ,ghc-bytestring-builder)
("ghc-network" ,ghc-network)
("ghc-primitive" ,ghc-primitive)
("ghc-vector" ,ghc-vector)
("ghc-zlib-bindings" ,ghc-zlib-bindings)))
(native-inputs
`(("ghc-hunit" ,ghc-hunit)
("ghc-quickcheck" ,ghc-quickcheck)
("ghc-test-framework" ,ghc-test-framework)
("ghc-test-framework-hunit" ,ghc-test-framework-hunit)
("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2)
("ghc-zlib" ,ghc-zlib)))
(arguments
`(#:cabal-revision
("2" "1mcab95d6hm098myh9gp7sh10srigjphgvm8s9pfs7jg5hzghy14")))
(home-page "http://hackage.haskell.org/package/io-streams")
(synopsis "Simple and composable stream I/O")
(description "This library contains simple and easy-to-use
primitives for I/O using streams.")
(license license:bsd-3)))
(define-public ghc-io-streams-haproxy
(package
(name "ghc-io-streams-haproxy")
(version "1.0.0.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"io-streams-haproxy/io-streams-haproxy-"
version ".tar.gz"))
(sha256
(base32
"11nh9q158mgnvvb23s5ffg87lkhl5smk039yl43jghxmb214z0bp"))))
(build-system haskell-build-system)
(inputs
`(("ghc-attoparsec" ,ghc-attoparsec)
("ghc-io-streams" ,ghc-io-streams)
("ghc-network" ,ghc-network)))
(native-inputs
`(("ghc-hunit" ,ghc-hunit)
("ghc-test-framework" ,ghc-test-framework)
("ghc-test-framework-hunit" ,ghc-test-framework-hunit)))
(arguments
`(#:cabal-revision
("4" "06c51a057n5bc9xfbp2m4jz5ds4z1xvmsx5mppch6qfwbz7x5i9l")))
(home-page "http://snapframework.com/")
(synopsis "HAProxy protocol 1.5 support for io-streams")
(description "HAProxy protocol version 1.5 support
(see @uref{http://haproxy.1wt.eu/download/1.5/doc/proxy-protocol.txt})
for applications using io-streams. The proxy protocol allows information
about a networked peer (like remote address and port) to be propagated
through a forwarding proxy that is configured to speak this protocol.")
(license license:bsd-3)))
(define-public ghc-language-glsl
(package
(name "ghc-language-glsl")
(version "0.3.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"language-glsl/language-glsl-" version ".tar.gz"))
(sha256
(base32
"0hdg67ainlqpjjghg3qin6fg4p783m0zmjqh4rd5gyizwiplxkp1"))))
(build-system haskell-build-system)
(inputs `(("ghc-prettyclass" ,ghc-prettyclass)))
(arguments
`(#:tests? #f
#:cabal-revision
("1" "10ac9pk4jy75k03j1ns4b5136l4kw8krr2d2nw2fdmpm5jzyghc5")))
(home-page "http://hackage.haskell.org/package/language-glsl")
(synopsis "GLSL abstract syntax tree, parser, and pretty-printer")
(description "This package is a Haskell library for the
representation, parsing, and pretty-printing of GLSL 1.50 code.")
(license license:bsd-3)))
(define-public ghc-prettyclass
(package
(name "ghc-prettyclass")
(version "1.0.0.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"prettyclass/prettyclass-" version ".tar.gz"))
(sha256
(base32
"11l9ajci7nh1r547hx8hgxrhq8mh5gdq30pdf845wvilg9p48dz5"))))
(build-system haskell-build-system)
(home-page "http://hackage.haskell.org/package/prettyclass")
(synopsis "Pretty printing class similar to Show")
(description "This package provides a pretty printing class similar
to @code{Show}, based on the HughesPJ pretty printing library. It
provides the pretty printing class and instances for the Prelude
types.")
(license license:bsd-3)))
(define-public ghc-readable
(package
(name "ghc-readable")
(version "0.3.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"readable/readable-" version ".tar.gz"))
(sha256
(base32
"1ja39cg26wy2fs00gi12x7iq5k8i366pbqi3p916skfa5jnkfc3h"))))
(build-system haskell-build-system)
(home-page "https://github.com/mightybyte/readable")
(synopsis "Type class for reading from Text and ByteString")
(description "This package provides a @code{Readable} type class for
reading data types from @code{ByteString} and @code{Text}. It also
includes efficient implementations for common data types.")
(license license:bsd-3)))
(define-public ghc-threads
(package
(name "ghc-threads")
(version "0.5.1.6")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"threads/threads-" version ".tar.gz"))
(sha256
(base32
"0bjnjhnq3km6xqk0fn1fgyz5xdw4h6lylbwwbcmkkfzwcz0c76hk"))))
(build-system haskell-build-system)
(native-inputs
`(("ghc-concurrent-extra" ,ghc-concurrent-extra)
("ghc-hunit" ,ghc-hunit)
("ghc-test-framework" ,ghc-test-framework)
("ghc-test-framework-hunit" ,ghc-test-framework-hunit)))
(home-page "https://github.com/basvandijk/threads")
(synopsis "Fork threads and wait for their result")
(description "This package provides functions to fork threads and
wait for their result, whether it's an exception or a normal value.
Besides waiting for the termination of a single thread this package also
provides functions to wait for a group of threads to terminate. This
package is similar to the @code{threadmanager}, @code{async} and
@code{spawn} packages. The advantages of this package are:
@itemize
@item Simpler API.
@item More efficient in both space and time.
@item No space-leak when forking a large number of threads.
@item Correct handling of asynchronous exceptions.
@item GHC specific functionality like @code{forkOn} and
@code{forkIOWithUnmask}.
@end itemize")
(license license:bsd-3)))
(define-public ghc-zlib-bindings
(package
(name "ghc-zlib-bindings")
(version "0.1.1.5")
(source
(origin
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"zlib-bindings/zlib-bindings-" version ".tar.gz"))
(sha256
(base32
"02ciywlz4wdlymgc3jsnicz9kzvymjw1www2163gxidnz4wb8fy8"))))
(build-system haskell-build-system)
(inputs
`(("ghc-zlib" ,ghc-zlib)))
(native-inputs
`(("ghc-hspec" ,ghc-hspec)
("ghc-quickcheck" ,ghc-quickcheck)))
(arguments
`(#:cabal-revision
("2" "0fq49694gqkab8m0vq4i879blswczwd66n7xh4r4gwiahf0ryvqc")))
(home-page "https://github.com/snapframework/zlib-bindings")
(synopsis "Low-level bindings to the @code{zlib} package")
(description "This package provides low-level bindings to the
@code{zlib} package.")
(license license:bsd-3)))

File diff suppressed because it is too large Load diff

View file

@ -78,7 +78,6 @@ (define-public idris
("ghc-safe" ,ghc-safe)
("ghc-split" ,ghc-split)
("ghc-terminal-size" ,ghc-terminal-size)
("ghc-text" ,ghc-text)
("ghc-uniplate" ,ghc-uniplate)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-utf8-string" ,ghc-utf8-string)

View file

@ -70,14 +70,14 @@ (define-module (gnu packages photo)
(define-public libraw
(package
(name "libraw")
(version "0.19.3")
(version "0.19.4")
(source (origin
(method url-fetch)
(uri (string-append "https://www.libraw.org/data/LibRaw-"
version ".tar.gz"))
(sha256
(base32
"0xs1qb6pcvc4c43fy5xi3nkqxcif77gakkw99irf0fc5iccdd5px"))))
"07wnzw9k3mwdq9dmpmg94al3ksc065kskfbxkknnmhvrsv2iri8k"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))

View file

@ -4849,14 +4849,14 @@ (define-public ruby-redcloth
(define-public ruby-pg
(package
(name "ruby-pg")
(version "1.1.3")
(version "1.1.4")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "pg" version))
(sha256
(base32
"1pnjw3rspdfjssxyf42jnbsdlgri8ylysimp0s28wxb93k6ff2qb"))))
"0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy"))))
(build-system ruby-build-system)
(arguments
'(#:test-target "spec"))
@ -4865,7 +4865,7 @@ (define-public ruby-pg
("ruby-hoe" ,ruby-hoe)
("ruby-rspec" ,ruby-rspec)))
(inputs
`(("postgresql" ,postgresql-9.6)))
`(("postgresql" ,postgresql)))
(synopsis "Ruby interface to PostgreSQL")
(description "Pg is the Ruby interface to the PostgreSQL RDBMS. It works
with PostgreSQL 9.0 and later.")

View file

@ -1404,13 +1404,13 @@ (define-public r-mime
(define-public r-markdown
(package
(name "r-markdown")
(version "1.0")
(version "1.1")
(source (origin
(method url-fetch)
(uri (cran-uri "markdown" version))
(sha256
(base32
"19nrz0ba1yd5kicd65crkkz2r3kialm2hm6zdkp495l2s5r80b8p"))))
"06zwbrp14bri3470anadd7dvgmw06xf8df6v2pk64wx3f9sd934d"))))
(build-system r-build-system)
;; Skip check phase because the tests require the r-knitr package to be
;; installed. This prevents installation failures. Knitr normally
@ -1418,7 +1418,8 @@ (define-public r-markdown
;; package.
(arguments `(#:tests? #f))
(propagated-inputs
`(("r-mime" ,r-mime)))
`(("r-mime" ,r-mime)
("r-xfun" ,r-xfun)))
(home-page "https://github.com/rstudio/markdown")
(synopsis "Markdown rendering for R")
(description
@ -1448,13 +1449,13 @@ (define-public r-yaml
(define-public r-knitr
(package
(name "r-knitr")
(version "1.23")
(version "1.24")
(source (origin
(method url-fetch)
(uri (cran-uri "knitr" version))
(sha256
(base32
"16ba4258c915xydhniw4cw7fvv1vp4cnwd1w49ykx7zw00rznfq6"))))
"12bvs9fd61m7k7bq321qzrh2ccl9rq653s1anrvfb9s5ni1j0378"))))
(build-system r-build-system)
(propagated-inputs
`(("r-evaluate" ,r-evaluate)
@ -5140,14 +5141,14 @@ (define-public r-matrixmodels
(define-public r-quantreg
(package
(name "r-quantreg")
(version "5.42.1")
(version "5.51")
(source
(origin
(method url-fetch)
(uri (cran-uri "quantreg" version))
(sha256
(base32
"1aycnghci329yqw63kybv7sfjjx5whq3xs7xzic4wsaj7j4b1hjc"))))
"1cdx51a9g6fjq2g9arr6wp6ghkyl2m6bs2dj4kcycvpn8p9304yz"))))
(build-system r-build-system)
(native-inputs
`(("gfortran" ,gfortran)))

View file

@ -596,10 +596,8 @@ (define-public xmobar
`(("ghc-hinotify" ,ghc-hinotify)
("ghc-http" ,ghc-http)
("ghc-iwlib" ,ghc-iwlib)
("ghc-parsec" ,ghc-parsec)
("ghc-parsec-numbers" ,ghc-parsec-numbers)
("ghc-regex-compat" ,ghc-regex-compat)
("ghc-stm" ,ghc-stm)
("ghc-x11-xft" ,ghc-x11-xft)
("libxpm" ,libxpm)))
(arguments

View file

@ -3,6 +3,7 @@
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 ng0 <ng0@n0.is>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -52,7 +53,7 @@ (define-module (guix import hackage)
(define ghc-standard-libraries
;; List of libraries distributed with ghc (8.4.3).
;; https://downloads.haskell.org/~ghc/8.4.3/docs/html/users_guide/8.4.3-notes.html
;; Contents of ...-ghc-8.4.3/lib/ghc-8.4.3.
'("ghc"
"cabal" ;; in the output of `ghc-pkg list` Cabal is uppercased, but
;; hackage-name->package-name takes this into account.
@ -65,7 +66,9 @@ (define ghc-standard-libraries
"deepseq"
"directory"
"filepath"
"ghc"
"ghc-boot"
"ghc-boot-th"
"ghc-compact"
"ghc-prim"
"ghci"
@ -74,8 +77,11 @@ (define ghc-standard-libraries
"integer-gmp"
"mtl"
"parsec"
"pretty"
"process"
"stm"
"template-haskell"
"terminfo"
"text"
"time"
"transformers"