Skip to content

Commit

Permalink
Bump pandoc and GHC
Browse files Browse the repository at this point in the history
  • Loading branch information
@lierdakil
lierdakil committed May 4, 2024
1 parent 5a5d3a2 commit 6c78014
Show file tree
Hide file tree
Showing 7 changed files with 299 additions and 291 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/haskell.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ name: Haskell CI
on: [push]

env:
PANDOC_VERSION: "3.1.12.3"
PANDOC_VERSION: "3.1.13"

jobs:
build:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
ghcver: ['9.6.4']
ghcver: ['9.6.5']
runs-on: ${{ matrix.os }}
container: ${{ matrix.container }}
steps:
Expand Down
66 changes: 33 additions & 33 deletions cabal.project.freeze
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
active-repositories: hackage.haskell.org:merge
constraints: any.Cabal ==3.10.1.0,
any.Cabal-syntax ==3.10.1.0,
constraints: any.Cabal ==3.10.3.0,
any.Cabal-syntax ==3.10.3.0,
any.Glob ==0.10.2,
any.HUnit ==1.6.2.0,
any.JuicyPixels ==3.3.8,
Expand All @@ -17,7 +17,7 @@ constraints: any.Cabal ==3.10.1.0,
any.aeson-pretty ==0.8.10,
aeson-pretty -lib-only,
any.alex ==3.5.1.0,
any.ansi-terminal ==1.1,
any.ansi-terminal ==1.1.1,
ansi-terminal -example,
any.ansi-terminal-types ==1.1,
any.appar ==0.1.8,
Expand All @@ -32,10 +32,10 @@ constraints: any.Cabal ==3.10.1.0,
any.attoparsec ==0.14.4,
attoparsec -developer,
any.attoparsec-aeson ==2.2.0.1,
any.base ==4.18.2.0,
any.base-compat ==0.13.1,
any.base-compat-batteries ==0.13.1,
any.base-orphans ==0.9.1,
any.base ==4.18.2.1,
any.base-compat ==0.14.0,
any.base-compat-batteries ==0.14.0,
any.base-orphans ==0.9.2,
any.base16-bytestring ==1.0.2.0,
any.base64-bytestring ==1.2.1.0,
any.basement ==0.0.16,
Expand All @@ -53,8 +53,7 @@ constraints: any.Cabal ==3.10.1.0,
any.cabal-doctest ==1.0.9,
any.call-stack ==0.4.0,
any.case-insensitive ==1.2.1.0,
any.cassava ==0.5.3.0,
cassava -bytestring--lt-0_10_4,
any.cassava ==0.5.3.1,
any.cborg ==0.2.10.0,
cborg +optimize-gmp,
any.cereal ==0.5.8.3,
Expand All @@ -80,7 +79,7 @@ constraints: any.Cabal ==3.10.1.0,
criterion -embed-data-files -fast,
any.criterion-measurement ==0.2.1.0,
criterion-measurement -fast,
any.crypton ==0.34,
any.crypton ==1.0.0,
crypton -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq +support_pclmuldq +support_rdrand -support_sse +use_target_attributes,
any.crypton-connection ==0.3.2,
any.crypton-x509 ==1.7.6,
Expand All @@ -97,7 +96,7 @@ constraints: any.Cabal ==3.10.1.0,
any.dense-linear-algebra ==0.1.0.0,
any.digest ==0.0.2.1,
digest -have_arm64_crc32c -have_builtin_prefetch -have_mm_prefetch -have_sse42 -have_strong_getauxval -have_weak_getauxval +pkg-config,
any.directory ==1.3.8.1,
any.directory ==1.3.8.4,
any.distributive ==0.6.2.1,
distributive +semigroups +tagged,
any.djot ==0.1.1.3,
Expand All @@ -108,17 +107,17 @@ constraints: any.Cabal ==3.10.1.0,
any.emojis ==0.1.3,
any.exceptions ==0.10.7,
any.file-embed ==0.0.16.0,
any.filepath ==1.4.200.1,
any.filepath ==1.4.300.1,
any.generically ==0.1.1,
any.ghc-bignum ==1.3,
any.ghc-boot-th ==9.6.4,
any.ghc-boot-th ==9.6.5,
any.ghc-prim ==0.10.0,
any.gitrev ==1.3.1,
any.gridtables ==0.1.0.0,
any.haddock-library ==1.11.0,
any.half ==0.3.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.hourglass ==0.2.12,
Expand All @@ -143,9 +142,9 @@ constraints: any.Cabal ==3.10.1.0,
any.hslua-repl ==0.1.2,
hslua-repl -executable,
any.hslua-typing ==0.1.1,
any.hspec ==2.11.7,
any.hspec-core ==2.11.7,
any.hspec-discover ==2.11.7,
any.hspec ==2.11.8,
any.hspec-core ==2.11.8,
any.hspec-discover ==2.11.8,
any.hspec-expectations ==0.8.4,
any.http-client ==0.7.17,
http-client +network-uri,
Expand All @@ -169,14 +168,14 @@ constraints: any.Cabal ==3.10.1.0,
lpeg -rely-on-shared-lpeg-library,
any.lua ==2.3.2,
lua +allow-unsafe-gc -apicheck -cross-compile +export-dynamic -lua_32bits -pkg-config -system-lua,
any.math-functions ==0.3.4.3,
any.math-functions ==0.3.4.4,
math-functions +system-erf +system-expm1,
any.memory ==0.18.0,
memory +support_bytestring +support_deepseq,
any.microlens ==0.4.13.1,
any.microlens-ghc ==0.4.14.2,
any.microlens-ghc ==0.4.14.3,
any.microlens-mtl ==0.2.0.3,
any.microlens-th ==0.4.3.14,
any.microlens-th ==0.4.3.15,
any.microstache ==1.0.2.3,
any.mime-types ==0.1.2.0,
any.mono-traversable ==1.0.17.0,
Expand All @@ -191,13 +190,14 @@ constraints: any.Cabal ==3.10.1.0,
any.optparse-applicative ==0.18.1.0,
optparse-applicative +process,
any.ordered-containers ==0.2.3,
any.pandoc ==3.1.12.3,
any.os-string ==2.0.2.1,
any.pandoc ==3.1.13,
pandoc -embed_data_files,
any.pandoc-cli ==3.1.12.3,
any.pandoc-cli ==3.1.13,
pandoc-cli +lua -nightly -server,
pandoc-crossref +enable_flaky_tests,
any.pandoc-lua-engine ==0.2.1.3,
any.pandoc-lua-marshal ==0.2.5,
any.pandoc-lua-engine ==0.2.1.4,
any.pandoc-lua-marshal ==0.2.6,
any.pandoc-types ==1.23.1,
any.parallel ==3.2.2.0,
any.parsec ==3.1.16.1,
Expand All @@ -208,7 +208,7 @@ constraints: any.Cabal ==3.10.1.0,
prettyprinter -buildreadme +text,
any.prettyprinter-ansi-terminal ==1.1.3,
any.primitive ==0.9.0.0,
any.process ==1.6.17.0,
any.process ==1.6.19.0,
any.quickcheck-io ==0.2.0,
any.random ==1.2.1.2,
any.regex-base ==0.94.0.2,
Expand Down Expand Up @@ -248,7 +248,7 @@ constraints: any.Cabal ==3.10.1.0,
any.tagsoup ==0.14.8,
any.template-haskell ==2.20.0.0,
any.temporary ==1.3,
any.texmath ==0.12.8.7,
any.texmath ==0.12.8.8,
texmath -executable -server,
any.text ==2.0.2,
any.text-conversions ==0.3.1.1,
Expand All @@ -264,16 +264,16 @@ constraints: any.Cabal ==3.10.1.0,
any.time ==1.12.2,
any.time-compat ==1.9.6.1,
time-compat -old-locale,
any.tls ==2.0.1,
any.tls ==2.0.5,
tls -devel,
any.toml-parser ==2.0.0.0,
any.transformers ==0.6.1.0,
any.transformers-compat ==0.7.2,
transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
any.typed-process ==0.2.11.1,
any.typst ==0.5.0.2,
any.typst ==0.5.0.3,
typst -executable,
any.typst-symbols ==0.1.5,
any.typst-symbols ==0.1.6,
any.unicode-collation ==0.1.3.6,
unicode-collation -doctests -executable,
any.unicode-data ==0.4.0.1,
Expand Down Expand Up @@ -302,8 +302,8 @@ constraints: any.Cabal ==3.10.1.0,
any.xml-types ==0.3.8,
any.yaml ==0.11.11.2,
yaml +no-examples +no-exe,
any.zip-archive ==0.4.3.1,
any.zip-archive ==0.4.3.2,
zip-archive -executable,
any.zlib ==0.6.3.0,
zlib -bundled-c-zlib -non-blocking-ffi -pkg-config
index-state: hackage.haskell.org 2024-03-22T23:18:32Z
any.zlib ==0.7.1.0,
zlib -bundled-c-zlib +non-blocking-ffi +pkg-config
index-state: hackage.haskell.org 2024-05-04T16:06:31Z
70 changes: 35 additions & 35 deletions flake.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
exec "$CC" @<(printf '%q\n' "''${params[@]}")
fi
'';
hixProject = {ghc ? "ghc964"}: pkgs.haskell-nix.cabalProject' {
hixProject = {ghc ? "ghc965"}: pkgs.haskell-nix.cabalProject' {
compiler-nix-name = ghc;
src = nix-filter.lib {
root = ./.;
Expand Down
2 changes: 1 addition & 1 deletion stack.template.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: ghc-9.6.4
resolver: ghc-9.6.5
allow-newer: false
flags:
pandoc-crossref:
Expand Down
Loading

0 comments on commit 6c78014

Please sign in to comment.