Skip to content

Commit

Permalink
Merge branch 'conduit'
Browse files Browse the repository at this point in the history
  • Loading branch information
@hasufell
hasufell committed Apr 30, 2024
2 parents 78e5024 + 3b934a8 commit ea964ee
Show file tree
Hide file tree
Showing 27 changed files with 302 additions and 504 deletions.
11 changes: 9 additions & 2 deletions .github/workflows/cabal.project.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,13 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macOS-latest, macOS-11, windows-latest, ubuntu-latest]
os: [macOS-11, windows-latest, ubuntu-latest]
ghc: ["8.10.7", "9.0.2", "9.2.8", "9.4.8"]
include:
- os: macOS-latest
ghc: "9.2.8"
- os: macOS-latest
ghc: "9.4.8"
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand All @@ -30,8 +35,10 @@ jobs:
- name: Run build
run: |
env
curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_MINIMAL=1 BOOTSTRAP_HASKELL_NONINTERACTIVE=1 sh
[ -e ~/.ghcup/env ] && source ~/.ghcup/env
ghcup --version
ghcup run -i --cabal latest -- cabal update
ghcup run -i --cabal latest --ghc ${GHC_VER} -- cabal update
ghcup run -i --cabal latest --ghc ${GHC_VER} -- cabal build --project-file=cabal.ghc${GHC_VER//./}.project
env:
GHC_VER: ${{ matrix.ghc }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/stack.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ jobs:
- name: Run build
run: |
env
curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_MINIMAL=1 BOOTSTRAP_HASKELL_NONINTERACTIVE=1 sh
[ -e ~/.ghcup/env ] && source ~/.ghcup/env
ghcup --version
ghcup run -i --stack latest -- stack build
shell: bash
Expand Down
8 changes: 3 additions & 5 deletions cabal.ghc8107.Unix.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@ constraints: http-io-streams -brotli,
directory >= 1.3.8.3,
filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0

constraints: text -simdutf

if os(mingw32)
constraints: zlib +bundled-c-zlib,
lzma +static,
text -simdutf,
vty-windows >=0.2.0.2

if impl(ghc >= 9.4)
Expand Down Expand Up @@ -50,11 +51,8 @@ package cabal-plan
package aeson
flags: +ordered-keymap

package streamly
flags: +use-unliftio

package *
test-show-details: direct

allow-newer: cabal-install-parsers:tar, streamly:Win32
allow-newer: cabal-install-parsers:tar

57 changes: 26 additions & 31 deletions cabal.ghc8107.Unix.project.freeze
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
active-repositories: hackage.haskell.org:merge
constraints: any.Cabal ==3.10.2.1,
any.Cabal-syntax ==3.10.2.0,
constraints: any.Cabal ==3.10.3.0,
any.Cabal-syntax ==3.10.3.0,
any.HUnit ==1.6.2.0,
any.HsOpenSSL ==0.11.7.6,
HsOpenSSL -fast-bignum -homebrew-openssl -macports-openssl -use-pkg-config,
any.OneTuple ==0.4.1.1,
any.QuickCheck ==2.14.3,
QuickCheck -old-random +templatehaskell,
any.StateVar ==1.2.2,
any.abstract-deque ==0.3,
abstract-deque -usecas,
any.aeson ==2.2.1.0,
aeson +ordered-keymap,
any.aeson-pretty ==0.8.10,
Expand All @@ -25,28 +23,27 @@ constraints: any.Cabal ==3.10.2.1,
assoc +tagged,
any.async ==2.2.5,
async -bench,
any.atomic-primops ==0.8.5,
atomic-primops -debug,
any.attoparsec ==0.14.4,
attoparsec -developer,
any.base ==4.14.3.0,
any.base-compat ==0.13.1,
any.base-orphans ==0.9.1,
any.base16-bytestring ==1.0.2.0,
any.base64-bytestring ==1.2.1.0,
any.bifunctors ==5.6.1,
any.bifunctors ==5.6.2,
bifunctors +tagged,
any.bimap ==0.5.0,
any.binary ==0.8.9.1,
any.binary ==0.8.9.2,
any.binary-instances ==1.0.4,
any.binary-orphans ==1.0.4.1,
any.bitvec ==1.1.5.0,
bitvec +simd,
any.blaze-builder ==0.4.2.3,
any.brick ==2.1.1,
brick -demos,
any.bytestring ==0.11.5.3,
any.bz2 ==1.0.1.1,
any.bz2 ==1.0.1.2,
bz2 -cross +with-bzlib,
any.bzip2-clib ==1.0.8,
any.c2hs ==0.28.8,
c2hs +base3 -regression,
any.cabal-install-parsers ==0.6.1.1,
Expand All @@ -63,6 +60,7 @@ constraints: any.Cabal ==3.10.2.1,
comonad +containers +distributive +indexed-traversable,
any.composition-prelude ==3.0.0.2,
composition-prelude -development,
any.conduit ==1.3.5,
any.config-ini ==0.2.7.0,
config-ini -enable-doctests,
any.containers ==0.6.5.1,
Expand All @@ -77,7 +75,7 @@ constraints: any.Cabal ==3.10.2.1,
any.data-clist ==0.2,
any.data-fix ==0.3.2,
any.deepseq ==1.4.4.0,
any.directory ==1.3.8.3,
any.directory ==1.3.8.4,
directory -os-string,
any.disk-free-space ==0.1.0.1,
any.distributive ==0.6.2.1,
Expand All @@ -86,25 +84,23 @@ constraints: any.Cabal ==3.10.2.1,
dlist -werror,
any.exceptions ==0.10.4,
any.file-uri ==0.1.0.0,
any.filepath ==1.4.101.0,
any.filepath ==1.4.300.1,
filepath -cpphs,
any.foldable1-classes-compat ==0.1,
foldable1-classes-compat +tagged,
any.free ==5.2,
any.fusion-plugin-types ==0.1.0,
any.generic-arbitrary ==0.2.2,
any.generically ==0.1.1,
any.ghc-boot-th ==8.10.7,
any.ghc-byteorder ==4.11.0.0.10,
any.ghc-prim ==0.6.1,
any.happy ==1.20.1.1,
any.hashable ==1.4.3.0,
any.hashable ==1.4.4.0,
hashable +integer-gmp -random-initial-seed,
any.haskell-lexer ==1.1.1,
any.haskus-utils-data ==1.4,
any.haskus-utils-types ==1.5.1,
any.haskus-utils-variant ==3.3,
any.heaps ==0.4,
any.hsc2hs ==0.68.8,
hsc2hs -in-ghc-tree,
any.hspec ==2.10.10,
Expand All @@ -127,17 +123,18 @@ constraints: any.Cabal ==3.10.2.1,
language-c -allwarnings +iecfpextension +usebytestrings,
any.libarchive ==3.0.4.2,
libarchive -cross -low-memory +no-exe -system-libarchive,
any.libyaml-streamly ==0.2.2.1,
libyaml-streamly -no-unicode +system-libyaml,
any.lockfree-queue ==0.2.4,
any.libyaml ==0.1.4,
libyaml -no-unicode -system-libyaml,
any.libyaml-clib ==0.2.5,
any.lukko ==0.1.1.3,
lukko +ofd-locking,
any.lzma-static ==5.2.5.5,
any.megaparsec ==9.2.1,
megaparsec -dev,
any.microlens ==0.4.13.1,
any.microlens-mtl ==0.2.0.3,
any.microlens-th ==0.4.3.14,
any.microlens-th ==0.4.3.15,
any.mono-traversable ==1.0.17.0,
any.mtl ==2.2.2,
any.mtl-compat ==0.2.2,
mtl-compat -two-point-one -two-point-two,
Expand All @@ -160,8 +157,8 @@ constraints: any.Cabal ==3.10.2.1,
any.polyparse ==1.13,
any.pretty ==1.1.3.6,
any.pretty-terminal ==0.1.0.0,
any.primitive ==0.8.0.0,
any.process ==1.6.18.0,
any.primitive ==0.9.0.0,
any.process ==1.6.19.0,
any.profunctors ==5.6.2,
any.quickcheck-arbitrary-adt ==0.3.1.0,
any.quickcheck-io ==0.2.0,
Expand All @@ -188,8 +185,6 @@ constraints: any.Cabal ==3.10.2.1,
any.splitmix ==0.1.0.5,
splitmix -optimised-mixer,
any.stm ==2.5.0.1,
any.streamly ==0.8.3,
streamly -debug -dev -fusion-plugin -has-llvm -inspection -limit-build-mem -no-fusion +opt -streamk -streamly-core -use-c-malloc +use-unliftio,
any.strict ==0.5,
any.strict-base ==0.4.0.0,
any.tagged ==0.8.8,
Expand All @@ -205,15 +200,15 @@ constraints: any.Cabal ==3.10.2.1,
any.terminal-size ==0.3.4,
any.terminfo ==0.4.1.4,
any.text ==2.0.2,
text -developer +simdutf,
text -developer -simdutf,
any.text-binary ==0.2.1.1,
any.text-iso8601 ==0.1,
any.text-short ==0.1.5,
text-short -asserts,
any.text-zipper ==0.13,
any.tf-random ==0.5,
any.th-abstraction ==0.6.0.0,
any.th-compat ==0.1.4,
any.th-compat ==0.1.5,
any.th-lift ==0.8.4,
any.th-lift-instances ==0.1.20,
any.these ==1.2,
Expand All @@ -225,9 +220,7 @@ constraints: any.Cabal ==3.10.2.1,
transformers-base +orphaninstances,
any.transformers-compat ==0.7.2,
transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
any.unicode-data ==0.3.1,
unicode-data -ucd2haskell,
any.unix ==2.8.5.0,
any.unix ==2.8.5.1,
unix -os-string,
any.unix-bytestring ==0.3.7.8,
any.unix-compat ==0.7.1,
Expand All @@ -241,6 +234,8 @@ constraints: any.Cabal ==3.10.2.1,
any.uuid-types ==1.0.5.1,
any.vector ==0.13.1.0,
vector +boundschecks -internalchecks -unsafechecks -wall,
any.vector-algorithms ==0.9.0.1,
vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks,
any.vector-binary-instances ==0.2.5.2,
any.vector-stream ==0.1.0.1,
any.versions ==6.0.6,
Expand All @@ -252,9 +247,9 @@ constraints: any.Cabal ==3.10.2.1,
any.word-wrap ==0.5,
any.word8 ==0.1.3,
any.xor ==0.0.1.2,
any.yaml-streamly ==0.12.4,
yaml-streamly +no-examples +no-exe,
any.yaml ==0.11.11.2,
yaml +no-examples +no-exe,
any.zlib ==0.6.3.0,
zlib -bundled-c-zlib -non-blocking-ffi -pkg-config,
any.zlib-bindings ==0.1.1.5
index-state: hackage.haskell.org 2024-03-13T09:43:35Z
index-state: hackage.haskell.org 2024-04-27T07:39:32Z
5 changes: 1 addition & 4 deletions cabal.ghc8107.Win32.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,8 @@ package cabal-plan
package aeson
flags: +ordered-keymap

package streamly
flags: +use-unliftio

package *
test-show-details: direct

allow-newer: cabal-install-parsers:tar, streamly:Win32
allow-newer: cabal-install-parsers:tar

Loading

0 comments on commit ea964ee

Please sign in to comment.