Bump pandoc and compiler

lierdakil · Dec 28, 2023 · a219466 · a219466
1 parent 2e11975
commit a219466
Show file tree

Hide file tree

Showing 7 changed files with 262 additions and 217 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -3,7 +3,7 @@ name: Haskell CI
 on: [push]
 
 env:
-  PANDOC_VERSION: "3.1.8"
+  PANDOC_VERSION: "3.1.11"
 
 jobs:
   build:

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -30,7 +30,7 @@
         mkdir -p $out/lib/
         ln -s ${windows.mingw_w64}/lib/libcrypt32.a $out/lib/libCrypt32.a
       '';
-      hixProject = {ghc ? "ghc962"}: pkgs.haskell-nix.cabalProject' {
+      hixProject = {ghc ? "ghc963"}: pkgs.haskell-nix.cabalProject' {
         compiler-nix-name = ghc;
         src = nix-filter.lib {
           root = ./.;

diff --git a/pandoc-crossref.cabal b/pandoc-crossref.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.0
 
--- This file has been generated from package.yaml by hpack version 0.34.4.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -223,9 +223,9 @@ test-suite test-integrative
     , pandoc-crossref
     , pandoc-types ==1.23.*
     , text >=1.2.2 && <2.1
+  default-language: Haskell2010
   if flag(enable_flaky_tests)
     cpp-options: -DFLAKY
-  default-language: Haskell2010
 
 test-suite test-pandoc-crossref
   type: exitcode-stdio-1.0
@@ -250,9 +250,9 @@ test-suite test-pandoc-crossref
     , pandoc-crossref-internal
     , pandoc-types ==1.23.*
     , text >=1.2.2 && <2.1
+  default-language: Haskell2010
   if flag(enable_flaky_tests)
     cpp-options: -DFLAKY
-  default-language: Haskell2010
 
 benchmark simple
   type: exitcode-stdio-1.0

diff --git a/stack.template.yaml b/stack.template.yaml
@@ -1,4 +1,4 @@
-resolver: ghc-9.6.2
+resolver: ghc-9.6.3
 allow-newer: false
 flags:
   pandoc-crossref: